From 1befbb95b6a65e784f75a9497a9896a837b3d0c7 Mon Sep 17 00:00:00 2001 From: Francisco Palacios Date: Thu, 12 Jun 2014 18:57:21 -0700 Subject: [PATCH] Updating names --- Common/include/config_structure.hpp | 4 +- Common/include/config_structure.inl | 2 +- Common/include/dual_grid_structure.hpp | 12 +- Common/include/dual_grid_structure.inl | 2 +- Common/include/geometry_structure.hpp | 16 +- Common/include/geometry_structure.inl | 2 +- Common/include/grid_adaptation_structure.hpp | 2 +- Common/include/grid_adaptation_structure.inl | 2 +- Common/include/grid_movement_structure.hpp | 10 +- Common/include/grid_movement_structure.inl | 2 +- Common/include/linear_solvers_structure.hpp | 4 +- Common/include/linear_solvers_structure.inl | 2 +- Common/include/matrix_structure.hpp | 4 +- Common/include/matrix_structure.inl | 2 +- Common/include/option_structure.hpp | 16 +- Common/include/primal_grid_structure.hpp | 20 +- Common/include/primal_grid_structure.inl | 2 +- Common/include/vector_structure.hpp | 8 +- Common/include/vector_structure.inl | 2 +- Common/lib/Makefile.am | 2 +- Common/lib/Makefile.in | 2 +- Common/src/config_structure.cpp | 65 +- Common/src/dual_grid_structure.cpp | 2 +- Common/src/geometry_structure.cpp | 10 +- Common/src/grid_adaptation_structure.cpp | 8 +- Common/src/grid_movement_structure.cpp | 26 +- Common/src/linear_solvers_structure.cpp | 2 +- Common/src/matrix_structure.cpp | 2 +- Common/src/primal_grid_structure.cpp | 2 +- Common/src/vector_structure.cpp | 2 +- Doxygen/Doxyfile | 10 +- Makefile.am | 32 +- Makefile.in | 24 +- SU2_CFD/include/SU2_CFD.hpp | 2 +- SU2_CFD/include/definition_structure.hpp | 2 +- SU2_CFD/include/integration_structure.hpp | 8 +- SU2_CFD/include/integration_structure.inl | 2 +- SU2_CFD/include/iteration_structure.hpp | 2 +- SU2_CFD/include/numerics_machine_learning.inl | 2 +- .../numerics_machine_learning_turbulent.hpp | 2 +- SU2_CFD/include/numerics_structure.hpp | 162 +- SU2_CFD/include/numerics_structure.inl | 2 +- SU2_CFD/include/output_structure.hpp | 4 +- SU2_CFD/include/solver_structure.hpp | 40 +- SU2_CFD/include/solver_structure.inl | 2 +- SU2_CFD/include/variable_structure.hpp | 46 +- SU2_CFD/include/variable_structure.inl | 2 +- SU2_CFD/obj/Makefile.am | 2 +- SU2_CFD/obj/Makefile.in | 2 +- SU2_CFD/src/SU2_CFD.cpp | 2 +- SU2_CFD/src/definition_structure.cpp | 2 +- SU2_CFD/src/integration_structure.cpp | 2 +- SU2_CFD/src/integration_time.cpp | 2 +- SU2_CFD/src/iteration_structure.cpp | 2 +- SU2_CFD/src/numerics_adjoint_levelset.cpp | 2 +- SU2_CFD/src/numerics_adjoint_mean.cpp | 2 +- SU2_CFD/src/numerics_adjoint_tne2.cpp | 2 +- SU2_CFD/src/numerics_adjoint_turbulent.cpp | 2 +- SU2_CFD/src/numerics_direct_elasticity.cpp | 2 +- SU2_CFD/src/numerics_direct_heat.cpp | 2 +- SU2_CFD/src/numerics_direct_mean.cpp | 2 +- SU2_CFD/src/numerics_direct_poisson.cpp | 2 +- SU2_CFD/src/numerics_direct_tne2.cpp | 2 +- SU2_CFD/src/numerics_direct_transition.cpp | 2 +- SU2_CFD/src/numerics_direct_turbulent.cpp | 2 +- SU2_CFD/src/numerics_direct_wave.cpp | 2 +- SU2_CFD/src/numerics_linearized_mean.cpp | 2 +- SU2_CFD/src/numerics_linearized_turbulent.cpp | 2 +- .../numerics_machine_learning_turbulent.cpp | 2 +- SU2_CFD/src/numerics_structure.cpp | 2 +- SU2_CFD/src/numerics_template.cpp | 2 +- SU2_CFD/src/output_cgns.cpp | 46 +- SU2_CFD/src/output_paraview.cpp | 2 +- SU2_CFD/src/output_structure.cpp | 2 +- SU2_CFD/src/output_tecplot.cpp | 2 +- SU2_CFD/src/solver_adjoint_levelset.cpp | 2 +- SU2_CFD/src/solver_adjoint_mean.cpp | 2 +- SU2_CFD/src/solver_adjoint_tne2.cpp | 2 +- SU2_CFD/src/solver_adjoint_turbulent.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_poisson.cpp | 2 +- SU2_CFD/src/solver_direct_tne2.cpp | 2 +- SU2_CFD/src/solver_direct_transition.cpp | 2 +- SU2_CFD/src/solver_direct_turbulent.cpp | 2 +- SU2_CFD/src/solver_direct_wave.cpp | 2 +- SU2_CFD/src/solver_linearized_mean.cpp | 2 +- SU2_CFD/src/solver_linearized_turbulent.cpp | 2 +- SU2_CFD/src/solver_structure.cpp | 2 +- SU2_CFD/src/solver_template.cpp | 2 +- SU2_CFD/src/variable_adjoint_levelset.cpp | 2 +- SU2_CFD/src/variable_adjoint_mean.cpp | 2 +- SU2_CFD/src/variable_adjoint_tne2.cpp | 2 +- SU2_CFD/src/variable_adjoint_turbulent.cpp | 2 +- SU2_CFD/src/variable_direct_elasticity.cpp | 2 +- SU2_CFD/src/variable_direct_heat.cpp | 2 +- SU2_CFD/src/variable_direct_mean.cpp | 2 +- SU2_CFD/src/variable_direct_poisson.cpp | 2 +- SU2_CFD/src/variable_direct_tne2.cpp | 2 +- SU2_CFD/src/variable_direct_transition.cpp | 2 +- SU2_CFD/src/variable_direct_turbulent.cpp | 2 +- SU2_CFD/src/variable_direct_wave.cpp | 2 +- SU2_CFD/src/variable_linearized_mean.cpp | 2 +- SU2_CFD/src/variable_linearized_turbulent.cpp | 2 +- SU2_CFD/src/variable_structure.cpp | 2 +- SU2_CFD/src/variable_template.cpp | 2 +- SU2_DDC/obj/Makefile.am | 40 - {SU2_DDC => SU2_DEF}/bin/.gitignore | 0 .../include/SU2_DEF.hpp | 8 +- SU2_DEF/obj/Makefile.am | 40 + {SU2_MDC => SU2_DEF}/obj/Makefile.in | 60 +- .../SU2_MDC.cpp => SU2_DEF/src/SU2_DEF.cpp | 14 +- {SU2_GDC => SU2_DOT}/bin/.gitignore | 0 .../include/SU2_DOT.hpp | 8 +- SU2_DOT/obj/Makefile.am | 40 + {SU2_MAC => SU2_DOT}/obj/Makefile.in | 60 +- .../SU2_GPC.cpp => SU2_DOT/src/SU2_DOT.cpp | 14 +- SU2_GDC/obj/Makefile.am | 39 - {SU2_GPC => SU2_GEO}/bin/.gitignore | 0 .../include/SU2_GEO.hpp | 8 +- SU2_GEO/obj/Makefile.am | 39 + {SU2_GDC => SU2_GEO}/obj/Makefile.in | 60 +- .../SU2_GDC.cpp => SU2_GEO/src/SU2_GEO.cpp | 18 +- SU2_GPC/obj/Makefile.am | 40 - SU2_IDE/VisualStudio/SU2.lib/SU2.lib.vcxproj | 16 +- SU2_IDE/VisualStudio/SU2.sln | 12 +- SU2_IDE/VisualStudio/SU2.vcxproj | 6 +- SU2_IDE/VisualStudio/SU2_CFD/SU2_CFD.vcxproj | 16 +- .../SU2_DEF.vcxproj} | 22 +- .../SU2_DEF.vcxproj.filters} | 4 +- .../SU2_DEF.vcxproj.user} | 0 .../SU2_DOT.vcxproj} | 22 +- .../SU2_DOT.vcxproj.filters} | 4 +- .../SU2_DOT.vcxproj.user} | 0 .../SU2_GEO.vcxproj} | 24 +- .../SU2_GEO.vcxproj.filters} | 4 +- .../SU2_GEO.vcxproj.user} | 0 .../SU2_MDC/SU2_MDC.vcxproj.filters | 27 - .../SU2_MSH.vcxproj} | 22 +- .../SU2_MSH.vcxproj.filters} | 4 +- .../SU2_MSH.vcxproj.user} | 0 SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj | 207 --- .../SU2_PBC/SU2_PBC.vcxproj.filters | 27 - .../VisualStudio/SU2_PBC/SU2_PBC.vcxproj.user | 3 - .../SU2_PRT.vcxproj} | 22 +- .../SU2_PRT/SU2_PRT.vcxproj.filters | 27 + .../SU2_PRT.vcxproj.user} | 0 SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj | 206 --- .../SU2_SMC/SU2_SMC.vcxproj.filters | 27 - .../VisualStudio/SU2_SMC/SU2_SMC.vcxproj.user | 3 - SU2_IDE/VisualStudio/SU2_SOL/SU2_SOL.vcxproj | 16 +- SU2_IDE/Wing/SU2_Wing.wpr | 2 +- .../xcshareddata/SU2_CFD.xccheckout | 2 +- .../UserInterfaceState.xcuserstate | Bin 72102 -> 72375 bytes .../UserInterfaceState.xcuserstate | Bin 54168 -> 0 bytes .../WorkspaceSettings.xcsettings | 24 - .../xcdebugger/Breakpoints.xcbkptlist | 5 - .../xcschemes/SU2_DDC.xcscheme | 86 - .../xcschemes/xcschememanagement.plist | 37 - .../fpalacios.mode1v3 | 6 +- .../fpalacios.pbxuser | 32 +- .../project.pbxproj | 50 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/SU2_DEF.xccheckout | 41 + .../xcshareddata/SU2_MDC.xccheckout | 41 + .../fpalacios.mode1v3 | 6 +- .../fpalacios.pbxuser | 32 +- .../project.pbxproj | 44 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/SU2_DOT.xccheckout | 41 + .../UserInterfaceState.xcuserstate | Bin 66257 -> 0 bytes .../WorkspaceSettings.xcsettings | 10 - .../xcdebugger/Breakpoints.xcbkptlist | 5 - .../xcschemes/SU2_GDC.xcscheme | 93 -- .../xcschemes/SU2_GPC.xcscheme | 86 - .../xcschemes/xcschememanagement.plist | 32 - .../fpalacios.mode1v3 | 6 +- .../fpalacios.pbxuser | 32 +- .../project.pbxproj | 40 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/SU2_GEO.xccheckout | 41 + .../UserInterfaceState.xcuserstate | Bin 63670 -> 0 bytes .../WorkspaceSettings.xcsettings | 10 - .../xcschemes/SU2_GPC.xcscheme | 86 - .../xcschemes/xcschememanagement.plist | 22 - .../UserInterfaceState.xcuserstate | Bin 31931 -> 0 bytes .../xcschemes/SU2_MAC.xcscheme | 86 - .../xcschemes/xcschememanagement.plist | 22 - .../contents.xcworkspacedata | 7 - .../UserInterfaceState.xcuserstate | Bin 63047 -> 0 bytes .../WorkspaceSettings.xcsettings | 24 - .../xcschemes/SU2_MDC.xcscheme | 93 -- .../xcschemes/xcschememanagement.plist | 22 - .../fpalacios.mode1v3 | 6 +- .../fpalacios.pbxuser | 32 +- .../project.pbxproj | 44 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/SU2_MSH.xccheckout | 41 + .../Xcode/SU2_PBC.xcodeproj/fpalacios.mode1v3 | 1396 ----------------- .../Xcode/SU2_PBC.xcodeproj/fpalacios.pbxuser | 348 ---- .../Xcode/SU2_PBC.xcodeproj/project.pbxproj | 302 ---- .../contents.xcworkspacedata | 7 - .../UserInterfaceState.xcuserstate | Bin 38724 -> 0 bytes .../WorkspaceSettings.xcsettings | 10 - .../xcschemes/CFD_PBC.xcscheme | 93 -- .../xcschemes/xcschememanagement.plist | 22 - .../fpalacios.mode1v3 | 8 +- .../fpalacios.pbxuser | 46 +- .../project.pbxproj | 40 +- .../contents.xcworkspacedata | 7 + .../xcshareddata/SU2_DDC.xccheckout | 41 + .../Xcode/SU2_SOL.xcodeproj/project.pbxproj | 4 +- .../xcshareddata/SU2_SOL.xccheckout | 41 + .../UserInterfaceState.xcuserstate | Bin 95046 -> 97338 bytes .../xcschemes/SU2_SOL.xcscheme | 2 +- SU2_MAC/obj/Makefile.am | 40 - SU2_MDC/obj/Makefile.am | 40 - {SU2_MAC => SU2_MSH}/bin/.gitignore | 0 .../include/SU2_MSH.hpp | 8 +- SU2_MSH/obj/Makefile.am | 40 + {SU2_DDC => SU2_MSH}/obj/Makefile.in | 60 +- .../SU2_MAC.cpp => SU2_MSH/src/SU2_MSH.cpp | 100 +- SU2_PBC/bin/.gitignore | 2 - SU2_PBC/include/SU2_PBC.hpp | 33 - SU2_PBC/obj/Makefile.am | 40 - SU2_PBC/obj/Makefile.in | 630 -------- SU2_PBC/src/SU2_PBC.cpp | 99 -- {SU2_MDC => SU2_PRT}/bin/.gitignore | 0 .../include/SU2_PRT.hpp | 8 +- SU2_PRT/obj/Makefile.am | 40 + {SU2_GPC => SU2_PRT}/obj/Makefile.in | 60 +- .../SU2_DDC.cpp => SU2_PRT/src/SU2_PRT.cpp | 14 +- SU2_PY/2DChannel.py | 2 +- SU2_PY/3DChannel.py | 2 +- SU2_PY/Makefile.am | 2 +- SU2_PY/Makefile.in | 2 +- SU2_PY/SU2/eval/design.py | 2 +- SU2_PY/SU2/eval/functions.py | 2 +- SU2_PY/SU2/eval/gradients.py | 2 +- SU2_PY/SU2/io/config.py | 2 +- SU2_PY/SU2/io/data.py | 2 +- SU2_PY/SU2/io/filelock.py | 2 +- SU2_PY/SU2/io/redirect.py | 2 +- SU2_PY/SU2/io/state.py | 2 +- SU2_PY/SU2/io/tools.py | 4 +- SU2_PY/SU2/mesh/adapt.py | 6 +- SU2_PY/SU2/mesh/tools.py | 2 +- SU2_PY/SU2/opt/project.py | 2 +- SU2_PY/SU2/opt/scipy_tools.py | 2 +- SU2_PY/SU2/run/__init__.py | 10 +- SU2_PY/SU2/run/adjoint.py | 2 +- SU2_PY/SU2/run/decompose.py | 8 +- SU2_PY/SU2/run/deform.py | 8 +- SU2_PY/SU2/run/direct.py | 2 +- SU2_PY/SU2/run/geometry.py | 8 +- SU2_PY/SU2/run/interface.py | 46 +- SU2_PY/SU2/run/merge.py | 2 +- SU2_PY/SU2/run/projection.py | 10 +- SU2_PY/SU2/util/filter_adjoint.py | 2 +- SU2_PY/SU2/util/plot.py | 2 +- SU2_PY/SU2/util/which.py | 2 +- SU2_PY/change_version_number.py | 2 +- SU2_PY/compute_polar.py | 2 +- SU2_PY/compute_stability.py | 2 +- SU2_PY/config_gui.py | 2 +- SU2_PY/continuous_adjoint.py | 4 +- SU2_PY/documentation.txt | 15 +- SU2_PY/filter_adjoint.py | 2 +- SU2_PY/finite_differences.py | 2 +- SU2_PY/merge_solution.py | 2 +- SU2_PY/mesh_adaptation.py | 8 +- SU2_PY/mesh_deformation.py | 6 +- SU2_PY/package_tests.py | 8 +- SU2_PY/parallel_computation.py | 4 +- SU2_PY/parse_config.py | 2 +- SU2_PY/patient_designspace.py | 2 +- SU2_PY/shape_optimization.py | 2 +- SU2_SOL/include/SU2_SOL.hpp | 2 +- SU2_SOL/obj/Makefile.am | 2 +- SU2_SOL/obj/Makefile.in | 2 +- SU2_SOL/src/SU2_SOL.cpp | 2 +- SU2_UMC/bin/.gitignore | 2 - SU2_UMC/include/SU2_UMC.hpp | 44 - SU2_UMC/obj/Makefile.am | 39 - SU2_UMC/obj/Makefile.in | 628 -------- SU2_UMC/src/SU2_UMC.cpp | 1207 -------------- TestCases/README | 4 +- TestCases/parallel_regression.py | 6 +- TestCases/serial_regression.py | 2 +- config_template.cfg | 2 +- configure | 262 ++-- configure.ac | 78 +- .../share/autoconf/autoconf/autoconf.m4f | 848 +++++----- .../autotools/share/autoconf/autom4te.cfg | 8 +- .../share/autoconf/autotest/autotest.m4f | 132 +- .../autotools/share/autoconf/m4sugar/m4sh.m4f | 130 +- .../share/autoconf/m4sugar/m4sugar.m4f | 10 +- .../share/automake-1.12/Automake/Config.pm | 2 +- .../share/emacs/site-lisp/autoconf-mode.elc | Bin 3192 -> 3215 bytes .../share/emacs/site-lisp/autotest-mode.elc | Bin 2764 -> 2787 bytes externals/autotools/share/info/dir | 32 +- 302 files changed, 2323 insertions(+), 8160 deletions(-) delete mode 100644 SU2_DDC/obj/Makefile.am rename {SU2_DDC => SU2_DEF}/bin/.gitignore (100%) rename SU2_DDC/include/SU2_DDC.hpp => SU2_DEF/include/SU2_DEF.hpp (84%) create mode 100644 SU2_DEF/obj/Makefile.am rename {SU2_MDC => SU2_DEF}/obj/Makefile.in (88%) rename SU2_MDC/src/SU2_MDC.cpp => SU2_DEF/src/SU2_DEF.cpp (93%) rename {SU2_GDC => SU2_DOT}/bin/.gitignore (100%) rename SU2_GPC/include/SU2_GPC.hpp => SU2_DOT/include/SU2_DOT.hpp (84%) create mode 100644 SU2_DOT/obj/Makefile.am rename {SU2_MAC => SU2_DOT}/obj/Makefile.in (88%) rename SU2_GPC/src/SU2_GPC.cpp => SU2_DOT/src/SU2_DOT.cpp (97%) delete mode 100644 SU2_GDC/obj/Makefile.am rename {SU2_GPC => SU2_GEO}/bin/.gitignore (100%) rename SU2_GDC/include/SU2_GDC.hpp => SU2_GEO/include/SU2_GEO.hpp (84%) create mode 100644 SU2_GEO/obj/Makefile.am rename {SU2_GDC => SU2_GEO}/obj/Makefile.in (88%) rename SU2_GDC/src/SU2_GDC.cpp => SU2_GEO/src/SU2_GEO.cpp (98%) delete mode 100644 SU2_GPC/obj/Makefile.am rename SU2_IDE/VisualStudio/{SU2_MDC/SU2_MDC.vcxproj => SU2_DEF/SU2_DEF.vcxproj} (82%) rename SU2_IDE/VisualStudio/{SU2_DDC/SU2_DDC.vcxproj.filters => SU2_DEF/SU2_DEF.vcxproj.filters} (86%) rename SU2_IDE/VisualStudio/{SU2_DDC/SU2_DDC.vcxproj.user => SU2_DEF/SU2_DEF.vcxproj.user} (100%) rename SU2_IDE/VisualStudio/{SU2_GPC/SU2_GPC.vcxproj => SU2_DOT/SU2_DOT.vcxproj} (82%) rename SU2_IDE/VisualStudio/{SU2_GDC/SU2_GDC.vcxproj.filters => SU2_DOT/SU2_DOT.vcxproj.filters} (86%) rename SU2_IDE/VisualStudio/{SU2_GDC/SU2_GDC.vcxproj.user => SU2_DOT/SU2_DOT.vcxproj.user} (100%) rename SU2_IDE/VisualStudio/{SU2_GDC/SU2_GDC.vcxproj => SU2_GEO/SU2_GEO.vcxproj} (82%) rename SU2_IDE/VisualStudio/{SU2_GPC/SU2_GPC.vcxproj.filters => SU2_GEO/SU2_GEO.vcxproj.filters} (86%) rename SU2_IDE/VisualStudio/{SU2_GPC/SU2_GPC.vcxproj.user => SU2_GEO/SU2_GEO.vcxproj.user} (100%) delete mode 100644 SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.filters rename SU2_IDE/VisualStudio/{SU2_MAC/SU2_MAC.vcxproj => SU2_MSH/SU2_MSH.vcxproj} (82%) rename SU2_IDE/VisualStudio/{SU2_MAC/SU2_MAC.vcxproj.filters => SU2_MSH/SU2_MSH.vcxproj.filters} (86%) rename SU2_IDE/VisualStudio/{SU2_MAC/SU2_MAC.vcxproj.user => SU2_MSH/SU2_MSH.vcxproj.user} (100%) delete mode 100644 SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj delete mode 100644 SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.filters delete mode 100644 SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.user rename SU2_IDE/VisualStudio/{SU2_DDC/SU2_DDC.vcxproj => SU2_PRT/SU2_PRT.vcxproj} (82%) create mode 100644 SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.filters rename SU2_IDE/VisualStudio/{SU2_MDC/SU2_MDC.vcxproj.user => SU2_PRT/SU2_PRT.vcxproj.user} (100%) delete mode 100644 SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj delete mode 100644 SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.filters delete mode 100644 SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.user delete mode 100644 SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_DDC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist rename SU2_IDE/Xcode/{SU2_MDC.xcodeproj => SU2_DEF.xcodeproj}/fpalacios.mode1v3 (99%) rename SU2_IDE/Xcode/{SU2_MDC.xcodeproj => SU2_DEF.xcodeproj}/fpalacios.pbxuser (95%) rename SU2_IDE/Xcode/{SU2_MDC.xcodeproj => SU2_DEF.xcodeproj}/project.pbxproj (91%) rename SU2_IDE/Xcode/{SU2_DDC.xcodeproj => SU2_DEF.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (71%) create mode 100644 SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_DEF.xccheckout create mode 100644 SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_MDC.xccheckout rename SU2_IDE/Xcode/{SU2_GPC.xcodeproj => SU2_DOT.xcodeproj}/fpalacios.mode1v3 (99%) rename SU2_IDE/Xcode/{SU2_GPC.xcodeproj => SU2_DOT.xcodeproj}/fpalacios.pbxuser (93%) rename SU2_IDE/Xcode/{SU2_GPC.xcodeproj => SU2_DOT.xcodeproj}/project.pbxproj (92%) rename SU2_IDE/Xcode/{SU2_GPC.xcodeproj => SU2_DOT.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (71%) create mode 100644 SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DOT.xccheckout delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GDC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist rename SU2_IDE/Xcode/{SU2_GDC.xcodeproj => SU2_GEO.xcodeproj}/fpalacios.mode1v3 (99%) rename SU2_IDE/Xcode/{SU2_GDC.xcodeproj => SU2_GEO.xcodeproj}/fpalacios.pbxuser (93%) rename SU2_IDE/Xcode/{SU2_GDC.xcodeproj => SU2_GEO.xcodeproj}/project.pbxproj (92%) rename SU2_IDE/Xcode/{SU2_GDC.xcodeproj => SU2_GEO.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (71%) create mode 100644 SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/xcshareddata/SU2_GEO.xccheckout delete mode 100644 SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_MAC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_MAC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_MAC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_MDC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist rename SU2_IDE/Xcode/{SU2_MAC.xcodeproj => SU2_MSH.xcodeproj}/fpalacios.mode1v3 (99%) rename SU2_IDE/Xcode/{SU2_MAC.xcodeproj => SU2_MSH.xcodeproj}/fpalacios.pbxuser (94%) rename SU2_IDE/Xcode/{SU2_MAC.xcodeproj => SU2_MSH.xcodeproj}/project.pbxproj (92%) rename SU2_IDE/Xcode/{SU2_MAC.xcodeproj => SU2_MSH.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (71%) create mode 100644 SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/xcshareddata/SU2_MSH.xccheckout delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.mode1v3 delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.pbxuser delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.pbxproj delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/CFD_PBC.xcscheme delete mode 100644 SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist rename SU2_IDE/Xcode/{SU2_DDC.xcodeproj => SU2_PRT.xcodeproj}/fpalacios.mode1v3 (99%) rename SU2_IDE/Xcode/{SU2_DDC.xcodeproj => SU2_PRT.xcodeproj}/fpalacios.pbxuser (92%) rename SU2_IDE/Xcode/{SU2_DDC.xcodeproj => SU2_PRT.xcodeproj}/project.pbxproj (93%) create mode 100644 SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DDC.xccheckout create mode 100644 SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcshareddata/SU2_SOL.xccheckout delete mode 100644 SU2_MAC/obj/Makefile.am delete mode 100644 SU2_MDC/obj/Makefile.am rename {SU2_MAC => SU2_MSH}/bin/.gitignore (100%) rename SU2_MAC/include/SU2_MAC.hpp => SU2_MSH/include/SU2_MSH.hpp (84%) create mode 100644 SU2_MSH/obj/Makefile.am rename {SU2_DDC => SU2_MSH}/obj/Makefile.in (88%) rename SU2_MAC/src/SU2_MAC.cpp => SU2_MSH/src/SU2_MSH.cpp (69%) delete mode 100644 SU2_PBC/bin/.gitignore delete mode 100644 SU2_PBC/include/SU2_PBC.hpp delete mode 100644 SU2_PBC/obj/Makefile.am delete mode 100644 SU2_PBC/obj/Makefile.in delete mode 100644 SU2_PBC/src/SU2_PBC.cpp rename {SU2_MDC => SU2_PRT}/bin/.gitignore (100%) rename SU2_MDC/include/SU2_MDC.hpp => SU2_PRT/include/SU2_PRT.hpp (84%) create mode 100644 SU2_PRT/obj/Makefile.am rename {SU2_GPC => SU2_PRT}/obj/Makefile.in (88%) rename SU2_DDC/src/SU2_DDC.cpp => SU2_PRT/src/SU2_PRT.cpp (91%) delete mode 100644 SU2_UMC/bin/.gitignore delete mode 100644 SU2_UMC/include/SU2_UMC.hpp delete mode 100644 SU2_UMC/obj/Makefile.am delete mode 100644 SU2_UMC/obj/Makefile.in delete mode 100644 SU2_UMC/src/SU2_UMC.cpp diff --git a/Common/include/config_structure.hpp b/Common/include/config_structure.hpp index 80b28ba41b9..59351f630a9 100644 --- a/Common/include/config_structure.hpp +++ b/Common/include/config_structure.hpp @@ -3,7 +3,7 @@ * \brief All the information about the definition of the physical problem. * The subroutines and functions are in the config_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -52,7 +52,7 @@ using namespace std; * \brief Main class for defining the problem; basically this class reads the configuration file, and * stores all the information. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CConfig { private: diff --git a/Common/include/config_structure.inl b/Common/include/config_structure.inl index 8d2ef80f742..4071384c472 100644 --- a/Common/include/config_structure.inl +++ b/Common/include/config_structure.inl @@ -2,7 +2,7 @@ * \file config_structure.inl * \brief In-Line subroutines of the config_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/dual_grid_structure.hpp b/Common/include/dual_grid_structure.hpp index 4ba15a1c6d5..f04e7641638 100644 --- a/Common/include/dual_grid_structure.hpp +++ b/Common/include/dual_grid_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines for doing the complete dual grid structure. * The subroutines and functions are in the dual_grid_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -37,7 +37,7 @@ using namespace std; * \brief Class for controlling the dual volume definition. The dual volume is compose by * three main elements: points, edges, and vertices. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CDualGrid{ protected: @@ -122,7 +122,7 @@ class CDualGrid{ * \class CPoint * \brief Class for point definition (including control volume definition). * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPoint : public CDualGrid { private: @@ -154,7 +154,7 @@ class CPoint : public CDualGrid { unsigned short color; /*!< \brief Color of the point in the partitioning strategy. */ double Wall_Distance; /*!< \brief Distance to the nearest wall. */ double SharpEdge_Distance; /*!< \brief Distance to a sharp edge. */ - double Curvature; /*!< \brief Value of the surface curvature (SU2_GDC). */ + double Curvature; /*!< \brief Value of the surface curvature (SU2_GEO). */ unsigned long GlobalIndex; /*!< \brief Global index in the parallel simulation. */ unsigned short nNeighbor; /*!< \brief Color of the point in the partitioning strategy. */ @@ -682,7 +682,7 @@ class CPoint : public CDualGrid { * \class CEdge * \brief Class for defining an edge. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CEdge : public CDualGrid { private: @@ -819,7 +819,7 @@ class CEdge : public CDualGrid { * \class CVertex * \brief Class for vertex definition (equivalent to edges, but for the boundaries). * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CVertex : public CDualGrid { private: diff --git a/Common/include/dual_grid_structure.inl b/Common/include/dual_grid_structure.inl index 132a193421e..1770a482447 100644 --- a/Common/include/dual_grid_structure.inl +++ b/Common/include/dual_grid_structure.inl @@ -2,7 +2,7 @@ * \file dual_grid_structure.inl * \brief In-Line subroutines of the dual_grid_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/geometry_structure.hpp b/Common/include/geometry_structure.hpp index 5183abbc1ea..a530e2d5588 100644 --- a/Common/include/geometry_structure.hpp +++ b/Common/include/geometry_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines for creating the geometrical structure. * The subroutines and functions are in the geometry_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -59,7 +59,7 @@ using namespace std; * \brief Parent class for defining the geometry of the problem (complete geometry, * multigrid agglomerated geometry, only boundary geometry, etc..) * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CGeometry { protected: @@ -830,7 +830,7 @@ class CGeometry { * \brief Class for reading a defining the primal grid which is read from the * grid file in .su2 format. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPhysicalGeometry : public CGeometry { @@ -1246,7 +1246,7 @@ class CPhysicalGeometry : public CGeometry { * \brief Class for defining the multigrid geometry, the main delicated part is the * agglomeration stage, which is done in the declaration. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CMultiGridGeometry : public CGeometry { @@ -1416,7 +1416,7 @@ class CMultiGridGeometry : public CGeometry { * \brief Class for only defining the boundary of the geometry, this class is only * used in case we are not interested in the volumetric grid. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CBoundaryGeometry : public CGeometry { @@ -1521,7 +1521,7 @@ class CBoundaryGeometry : public CGeometry { * \class CDomainGeometry * \brief Class for defining an especial kind of grid used in the partioning stage. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CDomainGeometry : public CGeometry { long *Global_to_Local_Point; /*!< \brief Global-local indexation for the points. */ @@ -1593,7 +1593,7 @@ class CDomainGeometry : public CGeometry { * \class CPeriodicGeometry * \brief Class for defining a periodic boundary condition. * \author T. Economon, F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPeriodicGeometry : public CGeometry { CPrimalGrid*** newBoundPer; /*!< \brief Boundary vector for new periodic elements (primal grid information). */ @@ -1639,7 +1639,7 @@ class CPeriodicGeometry : public CGeometry { * \struct CMultiGridQueue * \brief Class for a multigrid queue system * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * \date Aug 12, 2012 */ class CMultiGridQueue { diff --git a/Common/include/geometry_structure.inl b/Common/include/geometry_structure.inl index 0d020fd66a7..8b2e76bb1e0 100644 --- a/Common/include/geometry_structure.inl +++ b/Common/include/geometry_structure.inl @@ -2,7 +2,7 @@ * \file geometry_structure.inl * \brief In-Line subroutines of the geometry_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/grid_adaptation_structure.hpp b/Common/include/grid_adaptation_structure.hpp index b9bc8cd2193..408fda7df1d 100644 --- a/Common/include/grid_adaptation_structure.hpp +++ b/Common/include/grid_adaptation_structure.hpp @@ -5,7 +5,7 @@ * technique definition). The subroutines and functions are in * the grid_movement_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/grid_adaptation_structure.inl b/Common/include/grid_adaptation_structure.inl index 375e25db2ff..3a04732add3 100644 --- a/Common/include/grid_adaptation_structure.inl +++ b/Common/include/grid_adaptation_structure.inl @@ -2,7 +2,7 @@ * \file grid_adaptation_structure.inl * \brief In-Line subroutines of the grid_adaptation_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/grid_movement_structure.hpp b/Common/include/grid_movement_structure.hpp index 3ef43409dae..a8f59b62184 100644 --- a/Common/include/grid_movement_structure.hpp +++ b/Common/include/grid_movement_structure.hpp @@ -5,7 +5,7 @@ * technique definition). The subroutines and functions are in * the grid_movement_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -44,7 +44,7 @@ using namespace std; * \brief Class for moving the surface and volumetric * numerical grid (2D and 3D problems). * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CGridMovement { public: @@ -73,7 +73,7 @@ class CGridMovement { * \class CFreeFormDefBox * \brief Class for defining the free form FFDBox structure. * \author F. Palacios & A. Galdran. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CFreeFormDefBox : public CGridMovement { public: @@ -646,7 +646,7 @@ class CFreeFormDefBox : public CGridMovement { * \class CVolumetricMovement * \brief Class for moving the volumetric numerical grid. * \author F. Palacios, A. Bueno, T. Economon, S. Padron. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CVolumetricMovement : public CGridMovement { protected: @@ -908,7 +908,7 @@ class CVolumetricMovement : public CGridMovement { * \class CSurfaceMovement * \brief Class for moving the surface numerical grid. * \author F. Palacios, T. Economon. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSurfaceMovement : public CGridMovement { protected: diff --git a/Common/include/grid_movement_structure.inl b/Common/include/grid_movement_structure.inl index 8a8e6865db7..dfa9b46972d 100644 --- a/Common/include/grid_movement_structure.inl +++ b/Common/include/grid_movement_structure.inl @@ -2,7 +2,7 @@ * \file grid_movement_structure.inl * \brief In-Line subroutines of the grid_movement_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/linear_solvers_structure.hpp b/Common/include/linear_solvers_structure.hpp index 8995203da31..20a81f760ec 100644 --- a/Common/include/linear_solvers_structure.hpp +++ b/Common/include/linear_solvers_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers for the classes related to linear solvers (CG, FGMRES, etc) * The subroutines and functions are in the linear_solvers_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -43,7 +43,7 @@ using namespace std; * \class CSysSolve * \brief Class for solving linear systems using classical and Krylov-subspace iterative methods * \author J. Hicken. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * The individual solvers could be stand-alone subroutines, but by * creating CSysSolve objects we can more easily assign different diff --git a/Common/include/linear_solvers_structure.inl b/Common/include/linear_solvers_structure.inl index a47a14527a5..0e606683408 100644 --- a/Common/include/linear_solvers_structure.inl +++ b/Common/include/linear_solvers_structure.inl @@ -2,7 +2,7 @@ * \file linear_solvers_structure.inl * \brief inline subroutines of the linear_solvers_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/matrix_structure.hpp b/Common/include/matrix_structure.hpp index 94fa1883b90..78e4f1e49ee 100644 --- a/Common/include/matrix_structure.hpp +++ b/Common/include/matrix_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines for creating the sparse matrices-by-blocks. * The subroutines and functions are in the matrix_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -38,7 +38,7 @@ using namespace std; * \brief Main class for defining sparse matrices-by-blocks with compressed row format. * \author A. Bueno, F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSysMatrix { private: diff --git a/Common/include/matrix_structure.inl b/Common/include/matrix_structure.inl index 196ceb7c3d1..f46707db858 100644 --- a/Common/include/matrix_structure.inl +++ b/Common/include/matrix_structure.inl @@ -2,7 +2,7 @@ * \file matrix_structure.inl * \brief In-Line subroutines of the matrix_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index 94c2fd949f7..0df996b0423 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -2,7 +2,7 @@ * \file option_structure.hpp * \brief Defines classes for referencing options for easy input in CConfig * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * Many of the classes in this file are templated, and therefore must * be declared and defined here; to keep all elements together, there @@ -106,14 +106,12 @@ inline string StringToUpperCase(const string & str) { */ enum SU2_COMPONENT { SU2_CFD = 1, /*!< \brief Running the SU2_CFD software. */ - SU2_MDC = 2, /*!< \brief Running the SU2_MDC software. */ - SU2_GPC = 3, /*!< \brief Running the SU2_GPC software. */ - SU2_DDC = 4, /*!< \brief Running the SU2_DDC software. */ - SU2_MAC = 5, /*!< \brief Running the SU2_MAC software. */ - SU2_GDC = 6, /*!< \brief Running the SU2_GDC software. */ - SU2_PBC = 7, /*!< \brief Running the SU2_PBC software. */ - SU2_SMC = 8, /*!< \brief Running the SU2_SMC software. */ - SU2_SOL = 9, /*!< \brief Running the SU2_SOL software. */ + SU2_DEF = 2, /*!< \brief Running the SU2_DEF software. */ + SU2_DOT = 3, /*!< \brief Running the SU2_DOT software. */ + SU2_PRT = 4, /*!< \brief Running the SU2_PRT software. */ + SU2_MSH = 5, /*!< \brief Running the SU2_MSH software. */ + SU2_GEO = 6, /*!< \brief Running the SU2_GEO software. */ + SU2_SOL = 7, /*!< \brief Running the SU2_SOL software. */ }; const unsigned int MAX_PARAMETERS = 10; /*!< \brief Maximum number of parameters for a design variable definition. */ diff --git a/Common/include/primal_grid_structure.hpp b/Common/include/primal_grid_structure.hpp index 1f9e1f9f4f5..4fd328435ef 100644 --- a/Common/include/primal_grid_structure.hpp +++ b/Common/include/primal_grid_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines for storing the primal grid structure. * The subroutines and functions are in the primal_grid_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -36,7 +36,7 @@ using namespace std; * \class CPrimalGrid * \brief Class to define the numerical primal grid. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPrimalGrid { protected: @@ -228,7 +228,7 @@ class CPrimalGrid { * \brief Class for vertex element definition. This kind * of element is used in the parallelization stuff. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CVertexMPI : public CPrimalGrid { private: @@ -338,7 +338,7 @@ class CVertexMPI : public CPrimalGrid { * \class CLine * \brief Class for line element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CLine : public CPrimalGrid { private: @@ -457,7 +457,7 @@ class CLine : public CPrimalGrid { * \class CTriangle * \brief Class for triangle element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTriangle : public CPrimalGrid { private: @@ -578,7 +578,7 @@ class CTriangle : public CPrimalGrid { * \class CRectangle * \brief Class for rectangle element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CRectangle : public CPrimalGrid { private: @@ -699,7 +699,7 @@ class CRectangle : public CPrimalGrid { * \class CTetrahedron * \brief Class for tetrahedron element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTetrahedron : public CPrimalGrid { private: @@ -807,7 +807,7 @@ class CTetrahedron : public CPrimalGrid { * \class CHexahedron * \brief Class for hexahedron element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CHexahedron : public CPrimalGrid { private: @@ -922,7 +922,7 @@ class CHexahedron : public CPrimalGrid { * \class CWedge * \brief Class for wedge element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CWedge : public CPrimalGrid { private: @@ -1033,7 +1033,7 @@ class CWedge : public CPrimalGrid { * \class CPyramid * \brief Class for pyramid element definition. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPyramid : public CPrimalGrid { private: diff --git a/Common/include/primal_grid_structure.inl b/Common/include/primal_grid_structure.inl index 85ef563daff..98583e81593 100644 --- a/Common/include/primal_grid_structure.inl +++ b/Common/include/primal_grid_structure.inl @@ -2,7 +2,7 @@ * \file primal_grid_structure.inl * \brief In-Line subroutines of the primal_grid_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/include/vector_structure.hpp b/Common/include/vector_structure.hpp index 28caaf3d552..750020bf41e 100644 --- a/Common/include/vector_structure.hpp +++ b/Common/include/vector_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers for the classes related to linear solvers (CG, FGMRES, etc) * The subroutines and functions are in the linear_solvers_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -43,7 +43,7 @@ const double eps = numeric_limits::epsilon(); /*!< \brief machine epsilo * \class CSysVector * \brief Class for holding and manipulating vectors needed by linear solvers * \author J. Hicken. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * We could use the STL vector as a base class here, but this gives us * more flexibility with the underlying data (e.g. we may decide to @@ -336,7 +336,7 @@ class CSysVector { * \class CMatrixVectorProduct * \brief abstract base class for defining matrix-vector products * \author J. Hicken. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * The Krylov-subspace solvers require only matrix-vector products and * not the actual matrix/Jacobian. We need some way to indicate which @@ -361,7 +361,7 @@ inline CMatrixVectorProduct::~CMatrixVectorProduct() {} * \class CPreconditioner * \brief abstract base class for defining preconditioning operation * \author J. Hicken. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * See the remarks regarding the CMatrixVectorProduct class. The same * idea applies here to the preconditioning operation. diff --git a/Common/include/vector_structure.inl b/Common/include/vector_structure.inl index 463ac21404f..a49cabb16dd 100644 --- a/Common/include/vector_structure.inl +++ b/Common/include/vector_structure.inl @@ -2,7 +2,7 @@ * \file vector_structure.inl * \brief inline subroutines of the vector_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/lib/Makefile.am b/Common/lib/Makefile.am index 8880e4b8466..d6861642958 100644 --- a/Common/lib/Makefile.am +++ b/Common/lib/Makefile.am @@ -1,4 +1,4 @@ -# SU^2 Makefile.am for common library +# SU2 Makefile.am for common library # Stanford University Aerospace Design Lab # # Created: 10/26/12 diff --git a/Common/lib/Makefile.in b/Common/lib/Makefile.in index e5311fe8beb..b3cbbaa6bff 100644 --- a/Common/lib/Makefile.in +++ b/Common/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for common library +# SU2 Makefile.am for common library # Stanford University Aerospace Design Lab # # Created: 10/26/12 diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp index 25205d6672b..9b74d12837b 100644 --- a/Common/src/config_structure.cpp +++ b/Common/src/config_structure.cpp @@ -2,7 +2,7 @@ * \file config_structure.cpp * \brief Main file for reading the config file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -140,7 +140,7 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo iZone = val_iZone; - // This config file is parsed by a number of programs to make it easy to write SU^2 + // This config file is parsed by a number of programs to make it easy to write SU2 // wrapper scripts (in python, go, etc.) so please do // the best you can to follow the established format. It's very hard to parse c++ code // and none of us that write the parsers want to write a full c++ interpreter. Please @@ -212,14 +212,14 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo addStringListOption("ELEC_NEUMANN", nMarker_Neumann_Elec, Marker_Neumann_Elec); /* DESCRIPTION: Custom boundary marker(s) */ addStringListOption("MARKER_CUSTOM", nMarker_Custom, Marker_Custom); - /* DESCRIPTION: Periodic boundary marker(s) for use with SU2_PBC + /* DESCRIPTION: Periodic boundary marker(s) for use with SU2_MSH Format: ( periodic marker, donor marker, rotation_center_x, rotation_center_y, rotation_center_z, rotation_angle_x-axis, rotation_angle_y-axis, rotation_angle_z-axis, translation_x, translation_y, translation_z, ... ) */ addPeriodicOption("MARKER_PERIODIC", nMarker_PerBound, Marker_PerBound, Marker_PerDonor, Periodic_RotCenter, Periodic_RotAngles, Periodic_Translation); - /* DESCRIPTION: Periodic boundary marker(s) for use with SU2_PBC + /* DESCRIPTION: Periodic boundary marker(s) for use with SU2_MSH Format: ( periodic marker, donor marker, rotation_center_x, rotation_center_y, rotation_center_z, rotation_angle_x-axis, rotation_angle_y-axis, rotation_angle_z-axis, translation_x, translation_y, translation_z, ... ) */ @@ -1137,7 +1137,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_ #ifndef HAVE_TECIO if (Output_FileFormat == TECPLOT_BINARY) { - cout << "Tecplot binary file requested but SU^2 was built without TecIO support." << "\n"; + cout << "Tecplot binary file requested but SU2 was built without TecIO support." << "\n"; Output_FileFormat = TECPLOT; } #endif @@ -1146,9 +1146,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_ Kind_SU2 = val_software; - /*--- Only SU2_DDC, and SU2_CFD work with CGNS ---*/ + /*--- Only SU2_PRT, and SU2_CFD work with CGNS ---*/ - if ((Kind_SU2 != SU2_DDC) && (Kind_SU2 != SU2_CFD) && (Kind_SU2 != SU2_SOL)) { + if ((Kind_SU2 != SU2_PRT) && (Kind_SU2 != SU2_CFD) && (Kind_SU2 != SU2_SOL)) { if (Mesh_FileFormat == CGNS) { cout << "This software is not prepared for CGNS, please switch to SU2" << endl; exit(1); @@ -1166,9 +1166,9 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_ if ((size > SINGLE_NODE) && ((Kind_SU2 == SU2_CFD) || (Kind_SU2 == SU2_SOL))) Mesh_FileFormat = SU2; - /*--- Don't divide the numerical grid unless running SU2_MDC ---*/ + /*--- Don't divide the numerical grid unless running SU2_DEF ---*/ - if (Kind_SU2 != SU2_MDC) Divide_Element = false; + if (Kind_SU2 != SU2_DEF) Divide_Element = false; /*--- Identification of free-surface problem, this problems are always unsteady and incompressible. ---*/ @@ -2649,7 +2649,7 @@ void CConfig::SetMarkers(unsigned short val_software, unsigned short val_izone) nDomain = SINGLE_NODE; #else /*--- Identify the solvers that work in serial ---*/ - if ((val_software != SU2_DDC) && (val_software != SU2_MAC)) + if ((val_software != SU2_PRT) && (val_software != SU2_MSH)) MPI_Comm_size(MPI_COMM_WORLD, (int*)&nDomain); // any issue with type conversion here? MC else nDomain = SINGLE_NODE; @@ -2972,17 +2972,16 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) { cout <<"| \\___ \\ | | | | / / Forum: www.cfd-online.com/Forums/su2/ |" << endl; cout <<"| ____) | | |__| | / /_ |" << endl; switch (val_software) { - case SU2_CFD: cout << "| |_____/ \\____/ |____| Suite (Computational Fluid Dynamic Code) |" << endl; break; - case SU2_MDC: cout << "| |_____/ \\____/ |____| Suite (Mesh Deformation Code) |" << endl; break; - case SU2_GPC: cout << "| |_____/ \\____/ |____| Suite (Gradient Projection Code) |" << endl; break; - case SU2_DDC: cout << "| |_____/ \\____/ |____| Suite (Domain Decomposition Code) |" << endl; break; - case SU2_MAC: cout << "| |_____/ \\____/ |____| Suite (Mesh Adaptation Code) |" << endl; break; - case SU2_GDC: cout << "| |_____/ \\____/ |____| Suite (Geometry Design Code) |" << endl; break; - case SU2_PBC: cout << "| |_____/ \\____/ |____| Suite (Periodic Boundary Code) |" << endl; break; + 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_PRT: cout << "| |_____/ \\____/ |____| Suite (Grid Partitioning 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 << "| Release 3.1.0 \"eagle\" |" << endl; + cout << "| Release 3.2.0 \"eagle\" |" << endl; cout <<"-------------------------------------------------------------------------" << endl; cout << "| SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). |" << endl; cout << "| SU2 is distributed in the hope that it will be useful, |" << endl; @@ -3164,7 +3163,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) { } - if (val_software == SU2_GDC) { + if (val_software == SU2_GEO) { if (nMarker_GeoEval != 0) { cout << "Surface(s) where the geometrical based functions is evaluated: "; for (iMarker_GeoEval = 0; iMarker_GeoEval < nMarker_GeoEval; iMarker_GeoEval++) { @@ -3178,11 +3177,11 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) { cout << "Input mesh file name: " << Mesh_FileName << endl; - if (val_software == SU2_GPC) { + if (val_software == SU2_DOT) { cout << "Input sensitivity file name: " << SurfAdjCoeff_FileName << "." << endl; } - if (val_software == SU2_MAC) { + if (val_software == SU2_MSH) { switch (Kind_Adaptation) { case FULL: case WAKE: case TWOPHASE: case FULL_FLOW: case FULL_ADJOINT: case FULL_LINEAR: case SMOOTHING: case SUPERSONIC_SHOCK: break; @@ -3199,18 +3198,18 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) { } } - if (val_software == SU2_MDC) { + if (val_software == SU2_DEF) { cout << endl <<"---------------------- Grid deformation parameters ----------------------" << endl; cout << "Grid deformation using a linear elasticity method." << endl; if (Hold_GridFixed == YES) cout << "Hold some regions of the mesh fixed (hardcode implementation)." < value <-> param):" <. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp index d9f31f2dc91..826a5d22562 100644 --- a/Common/src/geometry_structure.cpp +++ b/Common/src/geometry_structure.cpp @@ -2,7 +2,7 @@ * \file geometry_structure.cpp * \brief Main subroutines for creating the primal grid and multigrid structure. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -1337,7 +1337,7 @@ void CPhysicalGeometry::Read_SU2_Format(CConfig *config, string val_mesh_filenam text_line.erase (0,6); nElem = atoi(text_line.c_str()); #ifdef HAVE_MPI - if (config->GetKind_SU2() != SU2_DDC) { + if (config->GetKind_SU2() != SU2_PRT) { Local_nElem = nElem; MPI_Allreduce(&Local_nElem, &Global_nElem, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD); } @@ -1349,7 +1349,7 @@ void CPhysicalGeometry::Read_SU2_Format(CConfig *config, string val_mesh_filenam Global_nElem = nElem; #endif - if ((rank == MASTER_NODE) && (size > SINGLE_NODE) && (config->GetKind_SU2() != SU2_DDC)) + if ((rank == MASTER_NODE) && (size > SINGLE_NODE) && (config->GetKind_SU2() != SU2_PRT)) cout << Global_nElem << " interior elements including halo cells. " << endl; else if (rank == MASTER_NODE) cout << Global_nElem << " interior elements. " << endl; @@ -1662,7 +1662,7 @@ void CPhysicalGeometry::Read_SU2_Format(CConfig *config, string val_mesh_filenam /*--- Communicate the number of each element type to all processors. ---*/ #ifdef HAVE_MPI - if (config->GetKind_SU2() != SU2_DDC) { + if (config->GetKind_SU2() != SU2_PRT) { Local_nElemTri = nelem_triangle; Local_nElemQuad = nelem_quad; Local_nElemTet = nelem_tetra; @@ -1732,7 +1732,7 @@ void CPhysicalGeometry::Read_SU2_Format(CConfig *config, string val_mesh_filenam /*--- Set some important point information for parallel simulations. ---*/ #ifdef HAVE_MPI - if (config->GetKind_SU2() != SU2_DDC) { + if (config->GetKind_SU2() != SU2_PRT) { Local_nPoint = nPoint; Local_nPointDomain = nPointDomain; MPI_Allreduce(&Local_nPoint, &Global_nPoint, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD); MPI_Allreduce(&Local_nPointDomain, &Global_nPointDomain, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD); diff --git a/Common/src/grid_adaptation_structure.cpp b/Common/src/grid_adaptation_structure.cpp index f2cd40d64b9..92c7647cd4b 100644 --- a/Common/src/grid_adaptation_structure.cpp +++ b/Common/src/grid_adaptation_structure.cpp @@ -2,7 +2,7 @@ * \file grid_adaptation_structure.cpp * \brief Main subroutines for grid adaptation. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -3531,7 +3531,7 @@ void CGridAdaptation::SetRestart_FlowSolution(CConfig *config, CPhysicalGeometry restart_flowfile.open(cstr, ios::out); restart_flowfile.precision(15); - restart_flowfile << "Restart file generated with SU2_MAC" << endl; + restart_flowfile << "Restart file generated with SU2_MSH" << endl; for(iPoint = 0; iPoint < nPoint_new; iPoint++){ restart_flowfile << iPoint <<"\t"; @@ -3578,7 +3578,7 @@ void CGridAdaptation::SetRestart_AdjSolution(CConfig *config, CPhysicalGeometry restart_adjfile.open(cstr, ios::out); restart_adjfile.precision(15); - restart_adjfile << "Restart file generated with SU2_MAC" << endl; + restart_adjfile << "Restart file generated with SU2_MSH" << endl; for(iPoint = 0; iPoint < nPoint_new; iPoint++){ restart_adjfile << iPoint <<"\t"; @@ -3605,7 +3605,7 @@ void CGridAdaptation::SetRestart_LinSolution(CConfig *config, CPhysicalGeometry restart_linfile.open(cstr_, ios::out); restart_linfile.precision(15); - restart_linfile << "Restart file generated with SU2_MAC" << endl; + restart_linfile << "Restart file generated with SU2_MSH" << endl; for(iPoint = 0; iPoint < nPoint_new; iPoint++){ restart_linfile << iPoint <<"\t"; diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp index 642db29673b..61d75d7aa0d 100644 --- a/Common/src/grid_movement_structure.cpp +++ b/Common/src/grid_movement_structure.cpp @@ -2,7 +2,7 @@ * \file grid_movement_structure.cpp * \brief Subroutines for doing the grid movement using different strategies. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -320,7 +320,7 @@ void CVolumetricMovement::ComputeDeforming_Wall_Distance(CGeometry *geometry, CC cout << "Computing distances to the nearest deforming surface." << endl; /*--- Get the SU2 module. SU2_CFD will use this routine for dynamically - deforming meshes (MARKER_MOVING), while SU2_MDC will use it for deforming + deforming meshes (MARKER_MOVING), while SU2_DEF will use it for deforming meshes after imposing design variable surface deformations (DV_MARKER). ---*/ unsigned short Kind_SU2 = config->GetKind_SU2(); @@ -332,7 +332,7 @@ void CVolumetricMovement::ComputeDeforming_Wall_Distance(CGeometry *geometry, CC nVertex_SolidWall = 0; for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) nVertex_SolidWall += geometry->GetnVertex(iMarker); /*--- Allocate an array to hold boundary node coordinates ---*/ @@ -347,7 +347,7 @@ void CVolumetricMovement::ComputeDeforming_Wall_Distance(CGeometry *geometry, CC nVertex_SolidWall = 0; for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) { if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) { iPoint = geometry->vertex[iMarker][iVertex]->GetNode(); for (iDim = 0; iDim < nDim; iDim++) @@ -397,7 +397,7 @@ void CVolumetricMovement::ComputeDeforming_Wall_Distance(CGeometry *geometry, CC for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) nLocalVertex_NS += geometry->GetnVertex(iMarker); /*--- Communicate to all processors the total number of deforming boundary @@ -426,7 +426,7 @@ void CVolumetricMovement::ComputeDeforming_Wall_Distance(CGeometry *geometry, CC nVertex_SolidWall = 0; for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) for (iVertex = 0; iVertex < geometry->GetnVertex(iMarker); iVertex++) { iPoint = geometry->vertex[iMarker][iVertex]->GetNode(); for (iDim = 0; iDim < nDim; iDim++) @@ -1614,7 +1614,7 @@ void CVolumetricMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig double *VarCoord, MeanCoord[3], VarIncrement = 1.0; /*--- Get the SU2 module. SU2_CFD will use this routine for dynamically - deforming meshes (MARKER_MOVING), while SU2_MDC will use it for deforming + deforming meshes (MARKER_MOVING), while SU2_DEF will use it for deforming meshes after imposing design variable surface deformations (DV_MARKER). ---*/ unsigned short Kind_SU2 = config->GetKind_SU2(); @@ -1675,7 +1675,7 @@ void CVolumetricMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) { if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) { + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) { for (iVertex = 0; iVertex < geometry->nVertex[iMarker]; iVertex++) { iPoint = geometry->vertex[iMarker][iVertex]->GetNode(); VarCoord = geometry->vertex[iMarker][iVertex]->GetVarCoord(); @@ -5095,7 +5095,7 @@ void CSurfaceMovement::SetAirfoil(CGeometry *boundary, CConfig *config) { string text_line; /*--- Get the SU2 module. SU2_CFD will use this routine for dynamically - deforming meshes (MARKER_MOVING), while SU2_MDC will use it for deforming + deforming meshes (MARKER_MOVING), while SU2_DEF will use it for deforming meshes after imposing design variable surface deformations (DV_MARKER). ---*/ unsigned short Kind_SU2 = config->GetKind_SU2(); @@ -5268,7 +5268,7 @@ void CSurfaceMovement::SetAirfoil(CGeometry *boundary, CConfig *config) { TotalArch = 0.0; for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) { if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) { + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) { for (iVertex = 0; iVertex < boundary->nVertex[iMarker]-1; iVertex++) { Coord_i = boundary->vertex[iMarker][iVertex]->GetCoord(); Coord_ip1 = boundary->vertex[iMarker][iVertex+1]->GetCoord(); @@ -5292,7 +5292,7 @@ void CSurfaceMovement::SetAirfoil(CGeometry *boundary, CConfig *config) { for (iVertex = 0; iVertex < boundary->nVertex[iMarker]; iVertex++) { VarCoord[0] = 0.0; VarCoord[1] = 0.0; VarCoord[2] = 0.0; if (((config->GetMarker_All_Moving(iMarker) == YES) && (Kind_SU2 == SU2_CFD)) || - ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_MDC))) { + ((config->GetMarker_All_DV(iMarker) == YES) && (Kind_SU2 == SU2_DEF))) { Point = boundary->vertex[iMarker][iVertex]->GetNode(); Coord = boundary->vertex[iMarker][iVertex]->GetCoord(); @@ -5602,7 +5602,7 @@ void CSurfaceMovement::ReadFFDInfo(CGeometry *geometry, CConfig *config, CFreeFo nSurfacePoints[iFFDBox] = my_nSurfPoints; nSurfPoints = 0; #ifdef HAVE_MPI - if (config->GetKind_SU2() != SU2_DDC) + if (config->GetKind_SU2() != SU2_PRT) MPI_Allreduce(&my_nSurfPoints, &nSurfPoints, 1, MPI_UNSIGNED_LONG, MPI_SUM, MPI_COMM_WORLD); else nSurfPoints = my_nSurfPoints; @@ -6030,7 +6030,7 @@ void CFreeFormDefBox::SetTecplot(CGeometry *geometry, unsigned short iFFDBox, bo if (new_file) { FFDBox_file.open(FFDBox_filename, ios::out); - FFDBox_file << "TITLE = \"Visualization of the FFD boxes generated by SU2_MDC.\"" << endl; + FFDBox_file << "TITLE = \"Visualization of the FFD boxes generated by SU2_DEF.\"" << endl; if (nDim == 2) FFDBox_file << "VARIABLES = \"x\", \"y\"" << endl; else FFDBox_file << "VARIABLES = \"x\", \"y\", \"z\"" << endl; } diff --git a/Common/src/linear_solvers_structure.cpp b/Common/src/linear_solvers_structure.cpp index 5e543ac5de0..aeaecb0f8cf 100644 --- a/Common/src/linear_solvers_structure.cpp +++ b/Common/src/linear_solvers_structure.cpp @@ -2,7 +2,7 @@ * \file linear_solvers_structure.cpp * \brief Main classes required for solving linear systems of equations * \author Current Development: Stanford University. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/src/matrix_structure.cpp b/Common/src/matrix_structure.cpp index 4213a336feb..0ab6927df33 100644 --- a/Common/src/matrix_structure.cpp +++ b/Common/src/matrix_structure.cpp @@ -2,7 +2,7 @@ * \file matrix_structure.cpp * \brief Main subroutines for doing the sparse structures. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/src/primal_grid_structure.cpp b/Common/src/primal_grid_structure.cpp index 5937fec82ec..8065a3031b3 100644 --- a/Common/src/primal_grid_structure.cpp +++ b/Common/src/primal_grid_structure.cpp @@ -2,7 +2,7 @@ * \file primal_grid_structure.cpp * \brief Main classes for defining the primal grid elements (triangle, tetrahedra, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Common/src/vector_structure.cpp b/Common/src/vector_structure.cpp index 3bf5a5241d2..8b7bc860f30 100644 --- a/Common/src/vector_structure.cpp +++ b/Common/src/vector_structure.cpp @@ -2,7 +2,7 @@ * \file vector_structure.cpp * \brief Main classes required for solving linear systems of equations * \author Current Development: Stanford University. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/Doxygen/Doxyfile b/Doxygen/Doxyfile index 8e82db0b149..e4ee3f82365 100644 --- a/Doxygen/Doxyfile +++ b/Doxygen/Doxyfile @@ -754,11 +754,11 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = ../Common \ - ../SU2_MDC \ - ../SU2_MAC \ - ../SU2_GPC \ - ../SU2_GDC \ - ../SU2_DDC \ + ../SU2_DEF \ + ../SU2_MSH \ + ../SU2_DOT \ + ../SU2_GEO \ + ../SU2_PRT \ ../SU2_CFD # This tag can be used to specify the character encoding of the source files diff --git a/Makefile.am b/Makefile.am index cceacd84cf8..8b3756ab9d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# SU^2 global Makefile.am +# SU2 global Makefile.am # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -26,34 +26,26 @@ if BUILD_CFD SUBDIRS +=SU2_CFD/obj endif -if BUILD_DDC -SUBDIRS +=SU2_DDC/obj +if BUILD_PRT +SUBDIRS +=SU2_PRT/obj endif -if BUILD_GPC -SUBDIRS +=SU2_GPC/obj +if BUILD_DOT +SUBDIRS +=SU2_DOT/obj endif -if BUILD_MAC -SUBDIRS +=SU2_MAC/obj +if BUILD_MSH +SUBDIRS +=SU2_MSH/obj endif -if BUILD_MDC -SUBDIRS +=SU2_MDC/obj -endif - -if BUILD_PBC -SUBDIRS +=SU2_PBC/obj +if BUILD_DEF +SUBDIRS +=SU2_DEF/obj endif if BUILD_SOL SUBDIRS +=SU2_SOL/obj endif -if BUILD_GDC -SUBDIRS +=SU2_GDC/obj -endif - -if BUILD_UMC -SUBDIRS +=SU2_UMC/obj -endif +if BUILD_GEO +SUBDIRS +=SU2_GEO/obj +endif \ No newline at end of file diff --git a/Makefile.in b/Makefile.in index 926b9cf59cd..34335263e6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 global Makefile.am +# SU2 global Makefile.am # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -65,14 +65,12 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @BUILD_CFD_TRUE@am__append_1 = SU2_CFD/obj -@BUILD_DDC_TRUE@am__append_2 = SU2_DDC/obj -@BUILD_GPC_TRUE@am__append_3 = SU2_GPC/obj -@BUILD_MAC_TRUE@am__append_4 = SU2_MAC/obj -@BUILD_MDC_TRUE@am__append_5 = SU2_MDC/obj -@BUILD_PBC_TRUE@am__append_6 = SU2_PBC/obj -@BUILD_SOL_TRUE@am__append_7 = SU2_SOL/obj -@BUILD_GDC_TRUE@am__append_8 = SU2_GDC/obj -@BUILD_UMC_TRUE@am__append_9 = SU2_UMC/obj +@BUILD_PRT_TRUE@am__append_2 = SU2_PRT/obj +@BUILD_DOT_TRUE@am__append_3 = SU2_DOT/obj +@BUILD_MSH_TRUE@am__append_4 = SU2_MSH/obj +@BUILD_DEF_TRUE@am__append_5 = SU2_DEF/obj +@BUILD_SOL_TRUE@am__append_6 = SU2_SOL/obj +@BUILD_GEO_TRUE@am__append_7 = SU2_GEO/obj subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING INSTALL \ @@ -122,9 +120,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = externals Common/lib SU2_PY SU2_CFD/obj SU2_DDC/obj \ - SU2_GPC/obj SU2_MAC/obj SU2_MDC/obj SU2_PBC/obj SU2_SOL/obj \ - SU2_GDC/obj SU2_UMC/obj +DIST_SUBDIRS = externals Common/lib SU2_PY SU2_CFD/obj SU2_PRT/obj \ + SU2_DOT/obj SU2_MSH/obj SU2_DEF/obj SU2_SOL/obj SU2_GEO/obj DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -291,8 +288,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 # build third-party optional dependencies first SUBDIRS = externals Common/lib SU2_PY $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) \ - $(am__append_6) $(am__append_7) $(am__append_8) \ - $(am__append_9) + $(am__append_6) $(am__append_7) all: all-recursive .SUFFIXES: diff --git a/SU2_CFD/include/SU2_CFD.hpp b/SU2_CFD/include/SU2_CFD.hpp index 8066cfa8a0b..80534b50feb 100644 --- a/SU2_CFD/include/SU2_CFD.hpp +++ b/SU2_CFD/include/SU2_CFD.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines of the code SU2_CFD. * The subroutines and functions are in the SU2_CFD.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/definition_structure.hpp b/SU2_CFD/include/definition_structure.hpp index b4ac3ff1012..1a73b855be2 100644 --- a/SU2_CFD/include/definition_structure.hpp +++ b/SU2_CFD/include/definition_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines used by SU2_CFD. * The subroutines and functions are in the definition_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/integration_structure.hpp b/SU2_CFD/include/integration_structure.hpp index 04a08cb8131..e5fcfa59fb0 100644 --- a/SU2_CFD/include/integration_structure.hpp +++ b/SU2_CFD/include/integration_structure.hpp @@ -4,7 +4,7 @@ * The subroutines and functions are in the integration_structure.cpp, * integration_time.cpp, and integration_notime.cpp files. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -42,7 +42,7 @@ using namespace std; * \brief Main class for doing the space integration, time integration, and monitoring * of a system of Partial Differential Equations (PDE). * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CIntegration { protected: @@ -313,7 +313,7 @@ class CIntegration { * \class CMultiGridIntegration * \brief Class for doing the numerical integration using a multigrid method. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CMultiGridIntegration : public CIntegration { protected: @@ -485,7 +485,7 @@ class CMultiGridIntegration : public CIntegration { * \class CSingleGridIntegration * \brief Class for doing the numerical integration of the turbulence model. * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSingleGridIntegration : public CIntegration { public: diff --git a/SU2_CFD/include/integration_structure.inl b/SU2_CFD/include/integration_structure.inl index 03686707318..3b4b6ed8916 100644 --- a/SU2_CFD/include/integration_structure.inl +++ b/SU2_CFD/include/integration_structure.inl @@ -2,7 +2,7 @@ * \file integration_structure.inl * \brief In-Line subroutines of the integration_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/iteration_structure.hpp b/SU2_CFD/include/iteration_structure.hpp index 7b2b072aa02..c7773a46f4c 100644 --- a/SU2_CFD/include/iteration_structure.hpp +++ b/SU2_CFD/include/iteration_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines used by SU2_CFD. * The subroutines and functions are in the definition_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/numerics_machine_learning.inl b/SU2_CFD/include/numerics_machine_learning.inl index da34439cd8a..3741a1cc7e4 100644 --- a/SU2_CFD/include/numerics_machine_learning.inl +++ b/SU2_CFD/include/numerics_machine_learning.inl @@ -2,7 +2,7 @@ * \file numerics_machine_learning.inl * \brief In-Line subroutines of the numerics_machine_learning.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/numerics_machine_learning_turbulent.hpp b/SU2_CFD/include/numerics_machine_learning_turbulent.hpp index ede60e18b74..8145f9bf23a 100644 --- a/SU2_CFD/include/numerics_machine_learning_turbulent.hpp +++ b/SU2_CFD/include/numerics_machine_learning_turbulent.hpp @@ -3,7 +3,7 @@ * \brief Header for caller functions of the turbulence models. * * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/numerics_structure.hpp b/SU2_CFD/include/numerics_structure.hpp index a13a2fd4599..97e3cee02df 100644 --- a/SU2_CFD/include/numerics_structure.hpp +++ b/SU2_CFD/include/numerics_structure.hpp @@ -5,7 +5,7 @@ * numerics_convective.cpp, numerics_viscous.cpp, and * numerics_source.cpp files. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -41,7 +41,7 @@ using namespace std; * \class CNumerics * \brief Class for defining the numerical methods. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CNumerics { protected: @@ -1453,7 +1453,7 @@ class CNumerics { * \brief Class for centered scheme - CUSP. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwCUSP_Flow : public CNumerics { @@ -1509,7 +1509,7 @@ class CUpwCUSP_Flow : public CNumerics { * \brief Class for solving an approximate Riemann solver of Roe for the flow equations. * \ingroup ConvDiscr * \author A. Bueno (UPM) & F. Palacios (Stanford University). - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwRoe_Flow : public CNumerics { private: @@ -1555,7 +1555,7 @@ class CUpwRoe_Flow : public CNumerics { * \brief Class for solving a flux-vector splitting method by Steger & Warming, modified version. * \ingroup ConvDiscr * \author ADL Stanford - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwMSW_Flow : public CNumerics { private: @@ -1600,7 +1600,7 @@ class CUpwMSW_Flow : public CNumerics { * \brief Class for solving an approximate Riemann solver of Roe with Turkel Preconditioning for the flow equations. * \ingroup ConvDiscr * \author A. K. Lonkar (Stanford University) - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwTurkel_Flow : public CNumerics { private: @@ -1655,7 +1655,7 @@ class CUpwTurkel_Flow : public CNumerics { * \brief Class for solving an approximate Riemann solver of Roe for the incompressible flow equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwArtComp_Flow : public CNumerics { private: @@ -1702,7 +1702,7 @@ class CUpwArtComp_Flow : public CNumerics { * \brief Class for solving an approximate Riemann solver of Roe for the incompressible flow equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwArtComp_FreeSurf_Flow : public CNumerics { private: @@ -1750,7 +1750,7 @@ class CUpwArtComp_FreeSurf_Flow : public CNumerics { * for the adjoint flow equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwRoe_AdjFlow : public CNumerics { private: @@ -1801,7 +1801,7 @@ class CUpwRoe_AdjFlow : public CNumerics { * for the adjoint flow equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwRoeArtComp_AdjFlow : public CNumerics { private: @@ -1845,7 +1845,7 @@ class CUpwRoeArtComp_AdjFlow : public CNumerics { * \brief Class for solving an approximate Riemann AUSM. * \ingroup ConvDiscr * \author F. Palacios - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwAUSM_Flow : public CNumerics { private: @@ -1892,7 +1892,7 @@ class CUpwAUSM_Flow : public CNumerics { * \brief Class for solving an approximate Riemann AUSM. * \ingroup ConvDiscr * \author F. Palacios, based on the Joe code implementation - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwHLLC_Flow : public CNumerics { private: @@ -1940,7 +1940,7 @@ class CUpwHLLC_Flow : public CNumerics { * \brief Class for performing a linear upwind solver for the Spalart-Allmaras turbulence model equations with transition * \ingroup ConvDiscr * \author A. Aranake - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwLin_TransLM : public CNumerics { private: @@ -1980,7 +1980,7 @@ class CUpwLin_TransLM : public CNumerics { * \brief Class for performing a linear upwind solver for the Level Set equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwLin_LevelSet : public CNumerics { private: @@ -2020,7 +2020,7 @@ class CUpwLin_LevelSet : public CNumerics { * \brief Class for performing a linear upwind solver for the adjoint Level Set equations. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwLin_AdjLevelSet : public CNumerics { private: @@ -2062,7 +2062,7 @@ class CUpwLin_AdjLevelSet : public CNumerics { * \brief Class for performing a linear upwind solver for the adjoint turbulence equations. * \ingroup ConvDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwLin_AdjTurb : public CNumerics { private: @@ -2098,7 +2098,7 @@ class CUpwLin_AdjTurb : public CNumerics { * \brief Class for doing a scalar upwind solver for the Spalar-Allmaral turbulence model equations. * \ingroup ConvDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwSca_TurbSA : public CNumerics { private: @@ -2138,7 +2138,7 @@ class CUpwSca_TurbSA : public CNumerics { * \brief Class for doing a scalar upwind solver for the Spalar-Allmaral turbulence model equations. * \ingroup ConvDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwSca_TurbML : public CNumerics { private: @@ -2177,7 +2177,7 @@ class CUpwSca_TurbML : public CNumerics { * \brief Class for doing a scalar upwind solver for the Menter SST turbulence model equations. * \ingroup ConvDiscr * \author A. Campos. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwSca_TurbSST : public CNumerics { private: @@ -2218,7 +2218,7 @@ class CUpwSca_TurbSST : public CNumerics { * \brief Class for doing a scalar upwind solver for the Spalart-Allmaras turbulence model equations with transition. * \ingroup ConvDiscr * \author A. Aranake. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwSca_TransLM : public CNumerics { private: @@ -2259,7 +2259,7 @@ class CUpwSca_TransLM : public CNumerics { * \brief Class for doing a scalar upwind solver for the adjoint turbulence equations. * \ingroup ConvDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwSca_AdjTurb : public CNumerics { private: @@ -2299,7 +2299,7 @@ class CUpwSca_AdjTurb : public CNumerics { * \brief Class for centered shceme - JST. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJST_KE_Flow : public CNumerics { @@ -2354,7 +2354,7 @@ class CCentJST_KE_Flow : public CNumerics { * \brief Class for centered scheme - JST. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJST_Flow : public CNumerics { @@ -2409,7 +2409,7 @@ class CCentJST_Flow : public CNumerics { * \brief Class for centered scheme - JST (artificial compressibility). * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJSTArtComp_Flow : public CNumerics { @@ -2463,7 +2463,7 @@ class CCentJSTArtComp_Flow : public CNumerics { * \brief Class for and adjoint centered scheme - JST. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJST_AdjFlow : public CNumerics { private: @@ -2513,7 +2513,7 @@ class CCentJST_AdjFlow : public CNumerics { * \brief Class for and adjoint centered scheme - JST. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJSTArtComp_AdjFlow : public CNumerics { private: @@ -2563,7 +2563,7 @@ class CCentJSTArtComp_AdjFlow : public CNumerics { * \brief Class for linearized centered scheme - JST. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentJST_LinFlow : public CNumerics { private: @@ -2612,7 +2612,7 @@ class CCentJST_LinFlow : public CNumerics { * \brief Class for computing the Lax-Friedrich centered scheme. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentLax_Flow : public CNumerics { private: @@ -2664,7 +2664,7 @@ class CCentLax_Flow : public CNumerics { * \brief Class for computing the Lax-Friedrich centered scheme (artificial compressibility). * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentLaxArtComp_Flow : public CNumerics { private: @@ -2717,7 +2717,7 @@ class CCentLaxArtComp_Flow : public CNumerics { * \brief Class for computing the Lax-Friedrich adjoint centered scheme. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentLax_AdjFlow : public CNumerics { private: @@ -2767,7 +2767,7 @@ class CCentLax_AdjFlow : public CNumerics { * \brief Class for computing the Lax-Friedrich adjoint centered scheme. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentLaxArtComp_AdjFlow : public CNumerics { private: @@ -2817,7 +2817,7 @@ class CCentLaxArtComp_AdjFlow : public CNumerics { * \brief Class for computing the Lax-Friedrich linearized centered scheme. * \ingroup ConvDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CCentLax_LinFlow : public CNumerics { private: @@ -2868,7 +2868,7 @@ class CCentLax_LinFlow : public CNumerics { * \brief Class for computing viscous term using the average of gradients. * \ingroup ViscDiscr * \author A. Bueno, and F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_Flow : public CNumerics { private: @@ -2912,7 +2912,7 @@ class CAvgGrad_Flow : public CNumerics { * \brief Class for computing viscous term using an average of gradients. * \ingroup ViscDiscr * \author A. Bueno, and F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradArtComp_Flow : public CNumerics { private: @@ -2954,7 +2954,7 @@ class CAvgGradArtComp_Flow : public CNumerics { * \brief Class for computing viscous term using average of gradients (Spalart-Allmaras Turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_TurbSA : public CNumerics { private: @@ -3001,7 +3001,7 @@ class CAvgGrad_TurbSA : public CNumerics { * \brief Class for computing viscous term using average of gradients (Spalart-Allmaras Turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_TurbML : public CNumerics { private: @@ -3047,7 +3047,7 @@ class CAvgGrad_TurbML : public CNumerics { * \brief Class for computing viscous term using average of gradients (Spalart-Allmaras Turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_TransLM : public CNumerics { private: @@ -3093,7 +3093,7 @@ class CAvgGrad_TransLM : public CNumerics { * \brief Class for computing the adjoint viscous terms. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_AdjFlow : public CNumerics { private: @@ -3135,7 +3135,7 @@ class CAvgGrad_AdjFlow : public CNumerics { * \brief Class for computing the adjoint viscous terms. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradArtComp_AdjFlow : public CNumerics { private: @@ -3174,7 +3174,7 @@ class CAvgGradArtComp_AdjFlow : public CNumerics { * \brief Class for computing viscous term using the average of gradients with a correction. * \ingroup ViscDiscr * \author A. Bueno, and F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_Flow : public CNumerics { private: @@ -3219,7 +3219,7 @@ class CAvgGradCorrected_Flow : public CNumerics { * \brief Class for computing viscous term using an average of gradients with correction (artificial compresibility). * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrectedArtComp_Flow : public CNumerics { private: @@ -3263,7 +3263,7 @@ class CAvgGradCorrectedArtComp_Flow : public CNumerics { * \brief Class for computing viscous term using average of gradients with correction (Spalart-Allmaras turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_TurbSA : public CNumerics { private: @@ -3305,7 +3305,7 @@ class CAvgGradCorrected_TurbSA : public CNumerics { * \brief Class for computing viscous term using average of gradients with correction (Spalart-Allmaras turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_TurbML : public CNumerics { private: @@ -3346,7 +3346,7 @@ class CAvgGradCorrected_TurbML : public CNumerics { * \brief Class for computing viscous term using average of gradients with correction (Spalart-Allmaras turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_TransLM : public CNumerics { private: @@ -3387,7 +3387,7 @@ class CAvgGradCorrected_TransLM : public CNumerics { * \brief Class for computing viscous term using average of gradient with correction (Menter SST turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_TurbSST : public CNumerics { private: @@ -3449,7 +3449,7 @@ class CAvgGrad_TurbSST : public CNumerics { * \brief Class for computing viscous term using average of gradient with correction (Menter SST turbulence model). * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_TurbSST : public CNumerics { private: @@ -3511,7 +3511,7 @@ class CAvgGradCorrected_TurbSST : public CNumerics { * \brief Class for computing the adjoint viscous terms, including correction. * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_AdjFlow : public CNumerics { private: @@ -3559,7 +3559,7 @@ class CAvgGradCorrected_AdjFlow : public CNumerics { * \brief Class for computing the adjoint viscous terms, including correction. * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrectedArtComp_AdjFlow : public CNumerics { private: @@ -3607,7 +3607,7 @@ class CAvgGradCorrectedArtComp_AdjFlow : public CNumerics { * \brief Class for adjoint turbulent using average of gradients with a correction. * \ingroup ViscDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_AdjTurb : public CNumerics { private: @@ -3659,7 +3659,7 @@ class CAvgGradCorrected_AdjTurb : public CNumerics { * \brief Class for adjoint turbulent using average of gradients with a correction. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_AdjTurb : public CNumerics { private: @@ -3711,7 +3711,7 @@ class CAvgGrad_AdjTurb : public CNumerics { * \brief Class for computing the stiffness matrix of the Galerkin method. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CGalerkin_Flow : public CNumerics { public: @@ -3742,7 +3742,7 @@ class CGalerkin_Flow : public CNumerics { * \brief Class for computing the stiffness matrix of the Galerkin method. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CGalerkin_FEA : public CNumerics { double E; /*!< \brief Young's modulus of elasticity. */ @@ -3846,7 +3846,7 @@ class CGalerkin_FEA : public CNumerics { * \brief Dummy class. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceNothing : public CNumerics { public: @@ -3870,7 +3870,7 @@ class CSourceNothing : public CNumerics { * \brief Class for integrating the source terms of the Spalart-Allmaras turbulence model equation. * \ingroup SourceDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_TurbSA : public CNumerics { private: @@ -3981,7 +3981,7 @@ class CSourcePieceWise_TurbSA : public CNumerics { * \brief Class for integrating the source terms of the Spalart-Allmaras turbulence model equation. * \ingroup SourceDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_TurbML : public CNumerics { private: @@ -4114,7 +4114,7 @@ class CSourcePieceWise_TurbML : public CNumerics { * \brief Class for integrating the source terms of the Spalart-Allmaras turbulence model equation. * \ingroup SourceDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_TransLM : public CNumerics { private: @@ -4186,7 +4186,7 @@ class CSourcePieceWise_TransLM : public CNumerics { * \brief Class for integrating the source terms of the Menter SST turbulence model equations. * \ingroup SourceDiscr * \author A. Campos. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_TurbSST : public CNumerics { private: @@ -4268,7 +4268,7 @@ class CSourcePieceWise_TurbSST : public CNumerics { * \brief Class for the source term integration of the gravity force. * \ingroup SourceDiscr * \author F. Palacios - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_FreeSurface : public CNumerics { double U_ref, L_ref, Froude; @@ -4303,7 +4303,7 @@ class CSourcePieceWise_FreeSurface : public CNumerics { * \brief Class for the source term integration of the gravity force. * \ingroup SourceDiscr * \author F. Palacios - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceGravity : public CNumerics { double Froude; @@ -4336,7 +4336,7 @@ class CSourceGravity : public CNumerics { * \brief Class for source term integration in adjoint problem. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceViscous_AdjFlow : public CNumerics { private: @@ -4378,7 +4378,7 @@ class CSourceViscous_AdjFlow : public CNumerics { * \brief Class for source term integration of the adjoint turbulent equation. * \ingroup SourceDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_AdjTurb : public CNumerics { private: @@ -4414,7 +4414,7 @@ class CSourcePieceWise_AdjTurb : public CNumerics { * \brief Class for source term integration of the adjoint poisson potential equation. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_AdjElec : public CNumerics { public: @@ -4445,7 +4445,7 @@ class CSourcePieceWise_AdjElec : public CNumerics { * \brief Class for source term integration of the adjoint level set equation. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_LevelSet : public CNumerics { public: @@ -4476,7 +4476,7 @@ class CSourcePieceWise_LevelSet : public CNumerics { * \brief Class for source term integration of the adjoint level set equation. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_AdjLevelSet : public CNumerics { public: @@ -4507,7 +4507,7 @@ class CSourcePieceWise_AdjLevelSet : public CNumerics { * \brief Class for source term integration of the linearized poisson potential equation. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourcePieceWise_LinElec : public CNumerics { public: @@ -4538,7 +4538,7 @@ class CSourcePieceWise_LinElec : public CNumerics { * \brief Class for source term integration in adjoint problem using a conservative scheme. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceConservative_AdjFlow : public CNumerics { private: @@ -4573,7 +4573,7 @@ class CSourceConservative_AdjFlow : public CNumerics { * \brief Class for source term integration in adjoint turbulent problem using a conservative scheme. * \ingroup SourceDiscr * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceConservative_AdjTurb : public CNumerics { public: @@ -4606,7 +4606,7 @@ class CSourceConservative_AdjTurb : public CNumerics { * \brief Class for a rotating frame source term. * \ingroup SourceDiscr * \author F. Palacios, T. Economon. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceRotatingFrame_Flow : public CNumerics { public: @@ -4638,7 +4638,7 @@ class CSourceRotatingFrame_Flow : public CNumerics { * \brief Source term class for rotating frame adjoint. * \ingroup SourceDiscr * \author T. Economon. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceRotatingFrame_AdjFlow : public CNumerics { public: @@ -4670,7 +4670,7 @@ class CSourceRotatingFrame_AdjFlow : public CNumerics { * \brief Class for source term for solving axisymmetric problems. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceAxisymmetric_Flow : public CNumerics { private: @@ -4705,7 +4705,7 @@ class CSourceAxisymmetric_Flow : public CNumerics { * \brief Class for source term for solving axisymmetric problems. * \ingroup SourceDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceAxisymmetric_AdjFlow : public CNumerics { public: @@ -4740,7 +4740,7 @@ class CSourceAxisymmetric_AdjFlow : public CNumerics { * \brief Magnetic source terms class * \ingroup SourceDiscr * \author A. Lonkar. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSource_Magnet : public CNumerics { private: @@ -4780,7 +4780,7 @@ class CSource_Magnet : public CNumerics { * \brief Source terms for Joule Heating * \ingroup SourceDiscr * \author A. Lonkar. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSource_JouleHeating : public CNumerics { private: @@ -4836,7 +4836,7 @@ class CSource_JouleHeating : public CNumerics { * \brief Class for a source term due to a wind gust. * \ingroup SourceDiscr * \author S. Padrón - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSourceWindGust : public CNumerics { public: @@ -4868,7 +4868,7 @@ class CSourceWindGust : public CNumerics { * \brief Dummy class. * \ingroup SourceDiscr * \author A. Lonkar. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSource_Template : public CNumerics { public: @@ -4902,7 +4902,7 @@ class CSource_Template : public CNumerics { * \brief Class for setting up new method for spatial discretization of convective terms in flow Equations * \ingroup ConvDiscr * \author A. Lonkar - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CConvective_Template : public CNumerics { private: @@ -4950,7 +4950,7 @@ class CConvective_Template : public CNumerics { * \brief Class for computing viscous term using average of gradients. * \ingroup ViscDiscr * \author F. Palacios - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CViscous_Template : public CNumerics { private: @@ -5036,7 +5036,7 @@ class CUpwRoe_TNE2 : public CNumerics { * \brief Class for solving a flux-vector splitting method by Steger & Warming, modified version. * \ingroup ConvDiscr * \author ADL Stanford - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CUpwMSW_TNE2 : public CNumerics { private: @@ -5237,7 +5237,7 @@ class CCentLax_TNE2 : public CNumerics { * \brief Class for computing viscous term using the average of gradients. * \ingroup ViscDiscr * \author S. R. Copeland - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_TNE2 : public CNumerics { private: @@ -5294,7 +5294,7 @@ class CAvgGrad_TNE2 : public CNumerics { * \brief Class for computing viscous term using the average of gradients. * \ingroup ViscDiscr * \author S. R. Copeland - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGradCorrected_TNE2 : public CNumerics { private: @@ -5626,7 +5626,7 @@ class CCentLax_AdjTNE2 : public CNumerics { * \brief Class for computing the adjoint viscous terms. * \ingroup ViscDiscr * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAvgGrad_AdjTNE2 : public CNumerics { private: diff --git a/SU2_CFD/include/numerics_structure.inl b/SU2_CFD/include/numerics_structure.inl index 13b8a0cffd5..f4abf1cd9b7 100644 --- a/SU2_CFD/include/numerics_structure.inl +++ b/SU2_CFD/include/numerics_structure.inl @@ -2,7 +2,7 @@ * \file numerics_structure.inl * \brief In-Line subroutines of the numerics_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/output_structure.hpp b/SU2_CFD/include/output_structure.hpp index 6f8ee5176ff..d2b0867ba15 100644 --- a/SU2_CFD/include/output_structure.hpp +++ b/SU2_CFD/include/output_structure.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines for generating the file outputs. * The subroutines and functions are in the output_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -48,7 +48,7 @@ using namespace std; * \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. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class COutput { diff --git a/SU2_CFD/include/solver_structure.hpp b/SU2_CFD/include/solver_structure.hpp index 1ebea1343f0..1002eb12078 100644 --- a/SU2_CFD/include/solver_structure.hpp +++ b/SU2_CFD/include/solver_structure.hpp @@ -5,7 +5,7 @@ * solution_direct.cpp, solution_adjoint.cpp, and * solution_linearized.cpp files. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -60,7 +60,7 @@ using namespace std; * \brief Main class for defining the PDE solution, it requires * a child class for each particular solver (Euler, Navier-Stokes, etc.) * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CSolver { protected: @@ -1832,7 +1832,7 @@ class CSolver { * \class CBaselineSolver * \brief Main class for defining a baseline solution from a restart file (for output). * \author F. Palacios, T. Economon. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CBaselineSolver : public CSolver { public: @@ -1877,7 +1877,7 @@ class CBaselineSolver : public CSolver { * \brief Main class for defining the Euler's flow solver. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CEulerSolver : public CSolver { protected: @@ -2921,7 +2921,7 @@ class CEulerSolver : public CSolver { * \brief Main class for defining the Navier-Stokes flow solver. * \ingroup Navier_Stokes_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CNSSolver : public CEulerSolver { private: @@ -3152,7 +3152,7 @@ class CNSSolver : public CEulerSolver { * \brief Main class for defining the turbulence model solver. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbSolver : public CSolver { protected: @@ -3280,7 +3280,7 @@ class CTurbSolver : public CSolver { * \brief Main class for defining the turbulence model solver. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbSASolver: public CTurbSolver { @@ -3464,7 +3464,7 @@ class CTurbSASolver: public CTurbSolver { * \brief Main class for defining the turbulence model solver. * \ingroup Turbulence_Model * \author B. Tracey. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbMLSolver: public CTurbSolver { @@ -3606,7 +3606,7 @@ class CTurbMLSolver: public CTurbSolver { * \brief Main class for defining the turbulence model solver. * \ingroup Turbulence_Model * \author A. Aranake. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTransLMSolver: public CTurbSolver { @@ -3782,7 +3782,7 @@ class CTransLMSolver: public CTurbSolver { * \brief Main class for defining the turbulence model solver. * \ingroup Turbulence_Model * \author A. Campos, F. Palacios, T. Economon - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbSSTSolver: public CTurbSolver { @@ -3920,7 +3920,7 @@ class CTurbSSTSolver: public CTurbSolver { * \brief Main class for defining the Euler's adjoint flow solver. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjEulerSolver : public CSolver { protected: @@ -4345,7 +4345,7 @@ class CAdjEulerSolver : public CSolver { * \brief Main class for defining the Navier-Stokes' adjoint flow solver. * \ingroup Navier_Stokes_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjNSSolver : public CAdjEulerSolver { public: @@ -4438,7 +4438,7 @@ class CAdjNSSolver : public CAdjEulerSolver { * \brief Main class for defining the adjoint turbulence model solver. * \ingroup Turbulence_Model * \author F. Palacios, A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjTurbSolver : public CSolver { private: @@ -4581,7 +4581,7 @@ class CAdjTurbSolver : public CSolver { * \brief Main class for defining the linearized Euler solver. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CLinEulerSolver : public CSolver { private: @@ -4704,7 +4704,7 @@ class CLinEulerSolver : public CSolver { /*! \class CPoissonSolver * \brief Main class for defining the poisson potential solver. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * \date May 3, 2010. */ class CPoissonSolver : public CSolver { @@ -4841,7 +4841,7 @@ class CPoissonSolver : public CSolver { /*! \class CWaveSolver * \brief Main class for defining the wave solver. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * \date May 3, 2010. */ class CWaveSolver : public CSolver { @@ -4996,7 +4996,7 @@ class CWaveSolver : public CSolver { /*! \class CHeatSolver * \brief Main class for defining the heat solver. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * \date May 3, 2010. */ class CHeatSolver : public CSolver { @@ -5114,7 +5114,7 @@ class CHeatSolver : public CSolver { /*! \class CFEASolver * \brief Main class for defining the FEA solver. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * \date May 3, 2010. */ class CFEASolver : public CSolver { @@ -5294,7 +5294,7 @@ class CFEASolver : public CSolver { * \brief Main class for defining the level set solver. * \ingroup LevelSet_Model * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjLevelSetSolver : public CSolver { protected: @@ -5473,7 +5473,7 @@ class CAdjLevelSetSolver : public CSolver { * \brief Main class for defining the template model solver. * \ingroup Template_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTemplateSolver : public CSolver { private: diff --git a/SU2_CFD/include/solver_structure.inl b/SU2_CFD/include/solver_structure.inl index 3c5dd6683aa..1a04cd6f1bb 100644 --- a/SU2_CFD/include/solver_structure.inl +++ b/SU2_CFD/include/solver_structure.inl @@ -2,7 +2,7 @@ * \file solver_structure.inl * \brief In-Line subroutines of the solver_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/include/variable_structure.hpp b/SU2_CFD/include/variable_structure.hpp index 6473e910158..f4dc229358c 100644 --- a/SU2_CFD/include/variable_structure.hpp +++ b/SU2_CFD/include/variable_structure.hpp @@ -4,7 +4,7 @@ * each kind of governing equation (direct, adjoint and linearized). * The subroutines and functions are in the variable_structure.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -36,7 +36,7 @@ using namespace std; * \class CVariable * \brief Main class for defining the variables. * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CVariable { protected: @@ -1560,7 +1560,7 @@ class CVariable { * \class CBaselineVariable * \brief Main class for defining the variables of a baseline solution from a restart file (for output). * \author F. Palacios, T. Economon. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CBaselineVariable : public CVariable { public: @@ -1590,7 +1590,7 @@ class CBaselineVariable : public CVariable { * \brief Main class for defining the variables of the potential solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CPotentialVariable : public CVariable { double *Charge_Density; @@ -1634,7 +1634,7 @@ class CPotentialVariable : public CVariable { * \brief Main class for defining the variables of the wave equation solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CWaveVariable : public CVariable { protected: @@ -1680,7 +1680,7 @@ class CWaveVariable : public CVariable { * \brief Main class for defining the variables of the Heat equation solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CHeatVariable : public CVariable { protected: @@ -1726,7 +1726,7 @@ class CHeatVariable : public CVariable { * \brief Main class for defining the variables of the FEA equation solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CFEAVariable : public CVariable { protected: @@ -1800,7 +1800,7 @@ class CFEAVariable : public CVariable { * \brief Main class for defining the variables of the Euler's solver. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CEulerVariable : public CVariable { protected: @@ -2169,7 +2169,7 @@ class CEulerVariable : public CVariable { * \brief Main class for defining the variables of the Navier-Stokes' solver. * \ingroup Navier_Stokes_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CNSVariable : public CEulerVariable { private: @@ -2314,7 +2314,7 @@ class CNSVariable : public CEulerVariable { * \brief Main class for defining the variables of the turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbVariable : public CVariable { protected: @@ -2358,7 +2358,7 @@ class CTurbVariable : public CVariable { * \brief Main class for defining the variables of the turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbSAVariable : public CTurbVariable { @@ -2405,7 +2405,7 @@ class CTurbSAVariable : public CTurbVariable { * \brief Main class for defining the variables of the turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbMLVariable : public CTurbVariable { @@ -2451,7 +2451,7 @@ class CTurbMLVariable : public CTurbVariable { * \brief Main class for defining the variables of the turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTransLMVariable : public CTurbVariable { @@ -2508,7 +2508,7 @@ class CTransLMVariable : public CTurbVariable { * \brief Main class for defining the variables of the turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTurbSSTVariable : public CTurbVariable { @@ -2570,7 +2570,7 @@ class CTurbSSTVariable : public CTurbVariable { * \brief Main class for defining the variables of the adjoint potential solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjPotentialVariable : public CVariable { private: @@ -2605,7 +2605,7 @@ class CAdjPotentialVariable : public CVariable { * \brief Main class for defining the variables of the adjoint Euler solver. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjEulerVariable : public CVariable { protected: @@ -2724,7 +2724,7 @@ class CAdjEulerVariable : public CVariable { * \brief Main class for defining the variables of the adjoint Navier-Stokes solver. * \ingroup Navier_Stokes_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjNSVariable : public CAdjEulerVariable { private: @@ -2796,7 +2796,7 @@ class CAdjNSVariable : public CAdjEulerVariable { * \brief Main class for defining the variables of the adjoint turbulence model. * \ingroup Turbulence_Model * \author A. Bueno. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjTurbVariable : public CVariable { protected: @@ -2846,7 +2846,7 @@ class CAdjTurbVariable : public CVariable { * \brief Main class for defining the variables of the linearized potential equation. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CLinPotentialVariable : public CVariable { public: @@ -2857,7 +2857,7 @@ class CLinPotentialVariable : public CVariable { * \brief Main class for defining the variables of the linearized Euler's equations. * \ingroup Euler_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CLinEulerVariable : public CVariable { private: @@ -2934,7 +2934,7 @@ class CLinEulerVariable : public CVariable { * \brief Main class for defining the variables of the linearized Navier-Stokes' equations. * \ingroup Navier_Stokes_Equations * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CLinNSVariable : public CLinEulerVariable { public: @@ -2945,7 +2945,7 @@ class CLinNSVariable : public CLinEulerVariable { * \brief Main class for defining the variables of the Level Set. * \ingroup LevelSet_Model * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CAdjLevelSetVariable : public CVariable { public: @@ -3749,7 +3749,7 @@ class CAdjTNE2NSVariable : public CAdjTNE2EulerVariable { * \brief Main class for defining the variables of the potential solver. * \ingroup Potential_Flow_Equation * \author F. Palacios. - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" */ class CTemplateVariable : public CVariable { public: diff --git a/SU2_CFD/include/variable_structure.inl b/SU2_CFD/include/variable_structure.inl index 51f20f7b3ac..4d5c73b12fd 100644 --- a/SU2_CFD/include/variable_structure.inl +++ b/SU2_CFD/include/variable_structure.inl @@ -2,7 +2,7 @@ * \file variable_structure.inl * \brief In-Line subroutines of the variable_structure.hpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/obj/Makefile.am b/SU2_CFD/obj/Makefile.am index df25aba01c1..5c369ed5e4e 100644 --- a/SU2_CFD/obj/Makefile.am +++ b/SU2_CFD/obj/Makefile.am @@ -1,4 +1,4 @@ -# SU^2 Makefile.am for CFD +# SU2 Makefile.am for CFD # Stanford University Aerospace Design Lab # # Created: 10/26/12 diff --git a/SU2_CFD/obj/Makefile.in b/SU2_CFD/obj/Makefile.in index f89f7088bce..3330775dd30 100644 --- a/SU2_CFD/obj/Makefile.in +++ b/SU2_CFD/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for CFD +# SU2 Makefile.am for CFD # Stanford University Aerospace Design Lab # # Created: 10/26/12 diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp index 1ae644286ea..a143574f881 100644 --- a/SU2_CFD/src/SU2_CFD.cpp +++ b/SU2_CFD/src/SU2_CFD.cpp @@ -2,7 +2,7 @@ * \file SU2_CFD.cpp * \brief Main file of Computational Fluid Dynamics Code (SU2_CFD). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/definition_structure.cpp b/SU2_CFD/src/definition_structure.cpp index d30824f5ff3..0531e3dcee0 100644 --- a/SU2_CFD/src/definition_structure.cpp +++ b/SU2_CFD/src/definition_structure.cpp @@ -2,7 +2,7 @@ * \file definition_structure.cpp * \brief Main subroutines used by SU2_CFD. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/integration_structure.cpp b/SU2_CFD/src/integration_structure.cpp index 45708337808..ebb47db62b0 100644 --- a/SU2_CFD/src/integration_structure.cpp +++ b/SU2_CFD/src/integration_structure.cpp @@ -2,7 +2,7 @@ * \file integration_structure.cpp * \brief This subroutine includes the space and time integration structure. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/integration_time.cpp b/SU2_CFD/src/integration_time.cpp index d727b49d549..6c421bdb07e 100644 --- a/SU2_CFD/src/integration_time.cpp +++ b/SU2_CFD/src/integration_time.cpp @@ -2,7 +2,7 @@ * \file integration_time.cpp * \brief Time deppending numerical method. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/iteration_structure.cpp b/SU2_CFD/src/iteration_structure.cpp index f23c6f1d957..35377958056 100644 --- a/SU2_CFD/src/iteration_structure.cpp +++ b/SU2_CFD/src/iteration_structure.cpp @@ -2,7 +2,7 @@ * \file iteration_structure.cpp * \brief Main subroutines used by SU2_CFD. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_adjoint_levelset.cpp b/SU2_CFD/src/numerics_adjoint_levelset.cpp index 8e6c1f8e43b..26682fd635b 100644 --- a/SU2_CFD/src/numerics_adjoint_levelset.cpp +++ b/SU2_CFD/src/numerics_adjoint_levelset.cpp @@ -2,7 +2,7 @@ * \file numerics_adjoint_levelset.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_adjoint_mean.cpp b/SU2_CFD/src/numerics_adjoint_mean.cpp index 4ea4ed2509e..edf12e2d676 100644 --- a/SU2_CFD/src/numerics_adjoint_mean.cpp +++ b/SU2_CFD/src/numerics_adjoint_mean.cpp @@ -2,7 +2,7 @@ * \file numerics_adjoint_mean.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_adjoint_tne2.cpp b/SU2_CFD/src/numerics_adjoint_tne2.cpp index 51686265ef6..238fd91ee6c 100644 --- a/SU2_CFD/src/numerics_adjoint_tne2.cpp +++ b/SU2_CFD/src/numerics_adjoint_tne2.cpp @@ -2,7 +2,7 @@ * \file numerics_adjoint_mean.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_adjoint_turbulent.cpp b/SU2_CFD/src/numerics_adjoint_turbulent.cpp index c37c39268ef..d1193b6d975 100644 --- a/SU2_CFD/src/numerics_adjoint_turbulent.cpp +++ b/SU2_CFD/src/numerics_adjoint_turbulent.cpp @@ -2,7 +2,7 @@ * \file numerics_adjoint_turbulent.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_elasticity.cpp b/SU2_CFD/src/numerics_direct_elasticity.cpp index 11044fe4e5c..db65393640f 100644 --- a/SU2_CFD/src/numerics_direct_elasticity.cpp +++ b/SU2_CFD/src/numerics_direct_elasticity.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_elasticity.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_heat.cpp b/SU2_CFD/src/numerics_direct_heat.cpp index b1f136844a6..f7a51207fde 100644 --- a/SU2_CFD/src/numerics_direct_heat.cpp +++ b/SU2_CFD/src/numerics_direct_heat.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_heat.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_mean.cpp b/SU2_CFD/src/numerics_direct_mean.cpp index fd51c045959..29744ef2892 100644 --- a/SU2_CFD/src/numerics_direct_mean.cpp +++ b/SU2_CFD/src/numerics_direct_mean.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_mean.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_poisson.cpp b/SU2_CFD/src/numerics_direct_poisson.cpp index 7986d90dd63..399daf48267 100644 --- a/SU2_CFD/src/numerics_direct_poisson.cpp +++ b/SU2_CFD/src/numerics_direct_poisson.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_poisson.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_tne2.cpp b/SU2_CFD/src/numerics_direct_tne2.cpp index 9f24c763486..619bc3e4c1d 100644 --- a/SU2_CFD/src/numerics_direct_tne2.cpp +++ b/SU2_CFD/src/numerics_direct_tne2.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_tne2.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_transition.cpp b/SU2_CFD/src/numerics_direct_transition.cpp index e39cfa4b363..d53631e31c4 100644 --- a/SU2_CFD/src/numerics_direct_transition.cpp +++ b/SU2_CFD/src/numerics_direct_transition.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_transition.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_turbulent.cpp b/SU2_CFD/src/numerics_direct_turbulent.cpp index 4365b633305..7251e88a92e 100644 --- a/SU2_CFD/src/numerics_direct_turbulent.cpp +++ b/SU2_CFD/src/numerics_direct_turbulent.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_turbulent.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_direct_wave.cpp b/SU2_CFD/src/numerics_direct_wave.cpp index 5205380c845..248c1a761ea 100644 --- a/SU2_CFD/src/numerics_direct_wave.cpp +++ b/SU2_CFD/src/numerics_direct_wave.cpp @@ -2,7 +2,7 @@ * \file numerics_direct_wave.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_linearized_mean.cpp b/SU2_CFD/src/numerics_linearized_mean.cpp index c5db1fc084d..cf55dadfb89 100644 --- a/SU2_CFD/src/numerics_linearized_mean.cpp +++ b/SU2_CFD/src/numerics_linearized_mean.cpp @@ -2,7 +2,7 @@ * \file numerics_linearized_mean.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_linearized_turbulent.cpp b/SU2_CFD/src/numerics_linearized_turbulent.cpp index 1ed72fe7d5e..95885eb32e1 100644 --- a/SU2_CFD/src/numerics_linearized_turbulent.cpp +++ b/SU2_CFD/src/numerics_linearized_turbulent.cpp @@ -2,7 +2,7 @@ * \file numerics_linearized_turbulent.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_machine_learning_turbulent.cpp b/SU2_CFD/src/numerics_machine_learning_turbulent.cpp index 32cbf4c47cb..4c252846511 100644 --- a/SU2_CFD/src/numerics_machine_learning_turbulent.cpp +++ b/SU2_CFD/src/numerics_machine_learning_turbulent.cpp @@ -2,7 +2,7 @@ * \file numerics_machine_learning_direct_turbulent.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_structure.cpp b/SU2_CFD/src/numerics_structure.cpp index b1529d2b5c6..01c76f03f94 100644 --- a/SU2_CFD/src/numerics_structure.cpp +++ b/SU2_CFD/src/numerics_structure.cpp @@ -2,7 +2,7 @@ * \file numerics_structure.cpp * \brief This file contains all the numerical methods. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/numerics_template.cpp b/SU2_CFD/src/numerics_template.cpp index df9f597e4ab..94340a923da 100644 --- a/SU2_CFD/src/numerics_template.cpp +++ b/SU2_CFD/src/numerics_template.cpp @@ -2,7 +2,7 @@ * \file numerics_template.cpp * \brief This file contains all the convective term discretization. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/output_cgns.cpp b/SU2_CFD/src/output_cgns.cpp index b0ed4e3552e..e9ee3f9cb23 100644 --- a/SU2_CFD/src/output_cgns.cpp +++ b/SU2_CFD/src/output_cgns.cpp @@ -2,7 +2,7 @@ * \file output_cgns.cpp * \brief Main subroutines for output solver information. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -107,11 +107,11 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned cgns_err = cg_open((char *)results_file.str().c_str(),CG_MODE_WRITE,&cgns_file); - element_dims = geometry->GetnDim(); // Currently (release 3.1.0 "eagle") only all-2D or all-3D zones permitted + element_dims = geometry->GetnDim(); // Currently (release 3.2.0 "eagle") only all-2D or all-3D zones permitted physical_dims = element_dims; - /*--- write CGNS base data (one base assumed as of version 3.1.0 "eagle") ---*/ - cgns_err = cg_base_write(cgns_file,"SU^2 Base",element_dims,physical_dims,&cgns_base_results); + /*--- write CGNS base data (one base assumed as of version 3.2.0 "eagle") ---*/ + 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] = geometry->GetGlobal_nPointDomain(); // vertex size @@ -119,7 +119,7 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned 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,"SU^2 Zone",isize[0],Unstructured,&cgns_zone_results); + 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"); @@ -140,18 +140,18 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned } else { /*--- Write a CGNS link for the node coordinates ---*/ - cgns_err = cg_link_write("GridCoordinates",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/GridCoordinates"); + 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(),"/SU^2 Base/SU^2 Zone/Triangle Elements"); - if (nGlobal_Quad > 0) cgns_err = cg_link_write("Quadrilateral Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Quadrilateral Elements"); - if (nGlobal_Tetr > 0) cgns_err = cg_link_write("Tetrahedral Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Tetrahedral Elements"); - if (nGlobal_Hexa > 0) cgns_err = cg_link_write("Hexahedral Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Hexahedral Elements"); - if (nGlobal_Pyra > 0) cgns_err = cg_link_write("Pyramid Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Pyramid Elements"); - if (nGlobal_Wedg > 0) cgns_err = cg_link_write("Wedge Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Wedge Elements"); - if (nGlobal_Line > 0) cgns_err = cg_link_write("Line Elements",(char *)base_file.c_str(),"/SU^2 Base/SU^2 Zone/Line Elements"); + 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_Wedg > 0) cgns_err = cg_link_write("Wedge Elements",(char *)base_file.c_str(),"/SU2 Base/SU2 Zone/Wedge 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(); @@ -165,7 +165,7 @@ void COutput::SetCGNS_Coordinates(CConfig *config, CGeometry *geometry, unsigned #else // Not built with CGNS support - cout << "CGNS file requested but SU^2 was built without CGNS support. No file written" << "\n"; + cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; #endif @@ -229,8 +229,8 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne element_dims = geometry->GetnDim(); // Currently (release 2.0) only all-2D or all-3D zones permitted physical_dims = element_dims; - /*--- write CGNS base data (one base assumed as of version 3.1.0 "eagle") ---*/ - cgns_err = cg_base_write(cgns_file,"SU^2 Base",element_dims,physical_dims,&cgns_base); + /*--- write CGNS base data (one base assumed as of version 3.2.0 "eagle") ---*/ + 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 ---*/ @@ -261,7 +261,7 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne 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","SU^2 version 3.1.0 \"eagle\", Stanford University Aerospace Design Lab"); + cgns_err = cg_descriptor_write("Solver Information","SU2 version 3.2.0 \"eagle\", Stanford University Aerospace Design Lab"); if (cgns_err) cg_error_print(); isize[0][0] = geometry->GetGlobal_nPointDomain(); //; // vertex size @@ -269,7 +269,7 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne 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,"SU^2 Zone",isize[0],Unstructured,&cgns_zone); + 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"); @@ -330,7 +330,7 @@ void COutput::SetCGNS_Connectivity(CConfig *config, CGeometry *geometry, unsigne #else // Not built with CGNS support - cout << "CGNS file requested but SU^2 was built without CGNS support. No file written" << "\n"; + cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; #endif @@ -421,8 +421,8 @@ void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned sh element_dims = geometry->GetnDim(); // Currently (release 2.0) only all-2D or all-3D zones permitted physical_dims = element_dims; -// /*--- write CGNS base data (one base assumed as of version 3.1.0 "eagle") ---*/ -// cgns_err = cg_base_write(cgns_file,"SU^2 Base",element_dims,physical_dims,&cgns_base); +// /*--- write CGNS base data (one base assumed as of version 3.2.0 "eagle") ---*/ +// cgns_err = cg_base_write(cgns_file,"SU2 Base",element_dims,physical_dims,&cgns_base); // if (cgns_err) cg_error_print(); isize[0][0] = nGlobal_Poin; // vertex size @@ -430,7 +430,7 @@ void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned sh 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,"SU^2 Zone",isize[0],Unstructured,&cgns_zone); +// 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"); @@ -539,7 +539,7 @@ void COutput::SetCGNS_Solution(CConfig *config, CGeometry *geometry, unsigned sh #else // Not built with CGNS support - cout << "CGNS file requested but SU^2 was built without CGNS support. No file written" << "\n"; + cout << "CGNS file requested but SU2 was built without CGNS support. No file written" << "\n"; #endif diff --git a/SU2_CFD/src/output_paraview.cpp b/SU2_CFD/src/output_paraview.cpp index 663cd9c123c..24b336f15f0 100644 --- a/SU2_CFD/src/output_paraview.cpp +++ b/SU2_CFD/src/output_paraview.cpp @@ -2,7 +2,7 @@ * \file output_paraview.cpp * \brief Main subroutines for output solver information. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/output_structure.cpp b/SU2_CFD/src/output_structure.cpp index 1ed3c441b6b..4712d8c900e 100644 --- a/SU2_CFD/src/output_structure.cpp +++ b/SU2_CFD/src/output_structure.cpp @@ -2,7 +2,7 @@ * \file output_structure.cpp * \brief Main subroutines for output solver information. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/output_tecplot.cpp b/SU2_CFD/src/output_tecplot.cpp index cd81cc59573..eb2f8a91ee0 100644 --- a/SU2_CFD/src/output_tecplot.cpp +++ b/SU2_CFD/src/output_tecplot.cpp @@ -2,7 +2,7 @@ * \file output_tecplot.cpp * \brief Main subroutines for output solver information. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_adjoint_levelset.cpp b/SU2_CFD/src/solver_adjoint_levelset.cpp index f443d6bceb9..7c9d62afb13 100644 --- a/SU2_CFD/src/solver_adjoint_levelset.cpp +++ b/SU2_CFD/src/solver_adjoint_levelset.cpp @@ -2,7 +2,7 @@ * \file solution_adjoint_levelset.cpp * \brief Main subrotuines for solving the level set problem. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_adjoint_mean.cpp b/SU2_CFD/src/solver_adjoint_mean.cpp index 09b70c11aef..9f5993f9756 100644 --- a/SU2_CFD/src/solver_adjoint_mean.cpp +++ b/SU2_CFD/src/solver_adjoint_mean.cpp @@ -2,7 +2,7 @@ * \file solution_adjoint_mean.cpp * \brief Main subrotuines for solving adjoint problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_adjoint_tne2.cpp b/SU2_CFD/src/solver_adjoint_tne2.cpp index da07c07c53b..10f6fff7322 100644 --- a/SU2_CFD/src/solver_adjoint_tne2.cpp +++ b/SU2_CFD/src/solver_adjoint_tne2.cpp @@ -2,7 +2,7 @@ * \file solution_adjoint_mean.cpp * \brief Main subrotuines for solving adjoint problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * Copyright (C) 2012 Aerospace Design Laboratory * diff --git a/SU2_CFD/src/solver_adjoint_turbulent.cpp b/SU2_CFD/src/solver_adjoint_turbulent.cpp index a328ee2d92f..53cd158344b 100644 --- a/SU2_CFD/src/solver_adjoint_turbulent.cpp +++ b/SU2_CFD/src/solver_adjoint_turbulent.cpp @@ -2,7 +2,7 @@ * \file solution_adjoint_turbulent.cpp * \brief Main subrotuines for solving adjoint problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_elasticity.cpp b/SU2_CFD/src/solver_direct_elasticity.cpp index 1c1f6d66ed1..f9d3f183051 100644 --- a/SU2_CFD/src/solver_direct_elasticity.cpp +++ b/SU2_CFD/src/solver_direct_elasticity.cpp @@ -2,7 +2,7 @@ * \file solution_direct_elasticity.cpp * \brief Main subrotuines for solving the linear elasticity equation. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_heat.cpp b/SU2_CFD/src/solver_direct_heat.cpp index afcf1e24db4..7d77266d489 100644 --- a/SU2_CFD/src/solver_direct_heat.cpp +++ b/SU2_CFD/src/solver_direct_heat.cpp @@ -3,7 +3,7 @@ * \file solution_direct_heat.cpp * \brief Main subrotuines for solving the heat equation. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_mean.cpp b/SU2_CFD/src/solver_direct_mean.cpp index ca180cd984c..8b4c77351fb 100644 --- a/SU2_CFD/src/solver_direct_mean.cpp +++ b/SU2_CFD/src/solver_direct_mean.cpp @@ -2,7 +2,7 @@ * \file solution_direct_mean.cpp * \brief Main subrotuines for solving direct problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_poisson.cpp b/SU2_CFD/src/solver_direct_poisson.cpp index e30ad13035d..4f79f2d187f 100644 --- a/SU2_CFD/src/solver_direct_poisson.cpp +++ b/SU2_CFD/src/solver_direct_poisson.cpp @@ -2,7 +2,7 @@ * \file solution_direct_poisson.cpp * \brief Main subrotuines for solving direct problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_tne2.cpp b/SU2_CFD/src/solver_direct_tne2.cpp index 5cc3794b35d..b9e49253d17 100644 --- a/SU2_CFD/src/solver_direct_tne2.cpp +++ b/SU2_CFD/src/solver_direct_tne2.cpp @@ -2,7 +2,7 @@ * \file solution_direct_tne2.cpp * \brief Main subrotuines for solving flows in thermochemical nonequilibrium. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * Copyright (C) 2012 Aerospace Design Laboratory * diff --git a/SU2_CFD/src/solver_direct_transition.cpp b/SU2_CFD/src/solver_direct_transition.cpp index dc214d5c1cf..2146fa331ec 100644 --- a/SU2_CFD/src/solver_direct_transition.cpp +++ b/SU2_CFD/src/solver_direct_transition.cpp @@ -2,7 +2,7 @@ * \file solution_direct_turbulent.cpp * \brief Main subrotuines for solving direct problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_turbulent.cpp b/SU2_CFD/src/solver_direct_turbulent.cpp index dbe0bb675fa..f2ca1cd0f04 100644 --- a/SU2_CFD/src/solver_direct_turbulent.cpp +++ b/SU2_CFD/src/solver_direct_turbulent.cpp @@ -2,7 +2,7 @@ * \file solution_direct_turbulent.cpp * \brief Main subrotuines for solving direct problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_direct_wave.cpp b/SU2_CFD/src/solver_direct_wave.cpp index 5e2b070aaf0..8d568aeacf0 100644 --- a/SU2_CFD/src/solver_direct_wave.cpp +++ b/SU2_CFD/src/solver_direct_wave.cpp @@ -2,7 +2,7 @@ * \file solution_direct_wave.cpp * \brief Main subrotuines for solving the wave equation. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_linearized_mean.cpp b/SU2_CFD/src/solver_linearized_mean.cpp index 53ea9b819ec..c772c1e2705 100644 --- a/SU2_CFD/src/solver_linearized_mean.cpp +++ b/SU2_CFD/src/solver_linearized_mean.cpp @@ -2,7 +2,7 @@ * \file solution_linearized_mean.cpp * \brief Main subrotuines for solving linearized problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_linearized_turbulent.cpp b/SU2_CFD/src/solver_linearized_turbulent.cpp index 65e8e606ef2..3280ef81977 100644 --- a/SU2_CFD/src/solver_linearized_turbulent.cpp +++ b/SU2_CFD/src/solver_linearized_turbulent.cpp @@ -2,7 +2,7 @@ * \file solution_linearized_turbulent.cpp * \brief Main subrotuines for solving linearized problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_structure.cpp b/SU2_CFD/src/solver_structure.cpp index 14d88344e0e..a676030e2d8 100644 --- a/SU2_CFD/src/solver_structure.cpp +++ b/SU2_CFD/src/solver_structure.cpp @@ -2,7 +2,7 @@ * \file solver_structure.cpp * \brief Main subrotuines for solving direct, adjoint and linearized problems. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/solver_template.cpp b/SU2_CFD/src/solver_template.cpp index 90879b46894..69da91bef20 100644 --- a/SU2_CFD/src/solver_template.cpp +++ b/SU2_CFD/src/solver_template.cpp @@ -2,7 +2,7 @@ * \file solution_template.cpp * \brief Main subrotuines for solving direct problems (Euler, Navier-Stokes, etc.). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_adjoint_levelset.cpp b/SU2_CFD/src/variable_adjoint_levelset.cpp index 0ec5f372c3a..2036ed7ecfa 100644 --- a/SU2_CFD/src/variable_adjoint_levelset.cpp +++ b/SU2_CFD/src/variable_adjoint_levelset.cpp @@ -2,7 +2,7 @@ * \file variable_adjoint_levelset.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_adjoint_mean.cpp b/SU2_CFD/src/variable_adjoint_mean.cpp index 81039ae53c9..03b4bb2ce51 100644 --- a/SU2_CFD/src/variable_adjoint_mean.cpp +++ b/SU2_CFD/src/variable_adjoint_mean.cpp @@ -2,7 +2,7 @@ * \file variable_adjoint_mean.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_adjoint_tne2.cpp b/SU2_CFD/src/variable_adjoint_tne2.cpp index 1bacbf2714c..4aa663c1fa6 100644 --- a/SU2_CFD/src/variable_adjoint_tne2.cpp +++ b/SU2_CFD/src/variable_adjoint_tne2.cpp @@ -2,7 +2,7 @@ * \file variable_adjoint_tne2.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_adjoint_turbulent.cpp b/SU2_CFD/src/variable_adjoint_turbulent.cpp index 6a78de94d46..2de0e2c916e 100644 --- a/SU2_CFD/src/variable_adjoint_turbulent.cpp +++ b/SU2_CFD/src/variable_adjoint_turbulent.cpp @@ -2,7 +2,7 @@ * \file variable_adjoint_turbulent.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_elasticity.cpp b/SU2_CFD/src/variable_direct_elasticity.cpp index fb7869aa7fd..4715973812d 100644 --- a/SU2_CFD/src/variable_direct_elasticity.cpp +++ b/SU2_CFD/src/variable_direct_elasticity.cpp @@ -2,7 +2,7 @@ * \file variable_direct_elasticity.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_heat.cpp b/SU2_CFD/src/variable_direct_heat.cpp index 51152c129b3..f39bfa4a1bc 100644 --- a/SU2_CFD/src/variable_direct_heat.cpp +++ b/SU2_CFD/src/variable_direct_heat.cpp @@ -2,7 +2,7 @@ * \file variable_direct_heat.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_mean.cpp b/SU2_CFD/src/variable_direct_mean.cpp index 40245509626..36a44e1fe7d 100644 --- a/SU2_CFD/src/variable_direct_mean.cpp +++ b/SU2_CFD/src/variable_direct_mean.cpp @@ -2,7 +2,7 @@ * \file variable_direct_mean.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_poisson.cpp b/SU2_CFD/src/variable_direct_poisson.cpp index 04e907be075..724dff27e33 100644 --- a/SU2_CFD/src/variable_direct_poisson.cpp +++ b/SU2_CFD/src/variable_direct_poisson.cpp @@ -2,7 +2,7 @@ * \file variable_direct_poisson.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_tne2.cpp b/SU2_CFD/src/variable_direct_tne2.cpp index 98c7c880e2f..4ebf7dbbab1 100644 --- a/SU2_CFD/src/variable_direct_tne2.cpp +++ b/SU2_CFD/src/variable_direct_tne2.cpp @@ -2,7 +2,7 @@ * \file variable_direct_tne2.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_transition.cpp b/SU2_CFD/src/variable_direct_transition.cpp index 6c3e6e05f3d..c56b3a69272 100644 --- a/SU2_CFD/src/variable_direct_transition.cpp +++ b/SU2_CFD/src/variable_direct_transition.cpp @@ -2,7 +2,7 @@ * \file variable_direct_transition.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_turbulent.cpp b/SU2_CFD/src/variable_direct_turbulent.cpp index c70613e3955..479101733fa 100644 --- a/SU2_CFD/src/variable_direct_turbulent.cpp +++ b/SU2_CFD/src/variable_direct_turbulent.cpp @@ -2,7 +2,7 @@ * \file variable_direct_turbulent.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_direct_wave.cpp b/SU2_CFD/src/variable_direct_wave.cpp index 2aea9637653..1e73ed96ada 100644 --- a/SU2_CFD/src/variable_direct_wave.cpp +++ b/SU2_CFD/src/variable_direct_wave.cpp @@ -2,7 +2,7 @@ * \file variable_direct_wave.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_linearized_mean.cpp b/SU2_CFD/src/variable_linearized_mean.cpp index a5c576b0999..e7743c90d98 100644 --- a/SU2_CFD/src/variable_linearized_mean.cpp +++ b/SU2_CFD/src/variable_linearized_mean.cpp @@ -2,7 +2,7 @@ * \file variable_linearized_mean.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_linearized_turbulent.cpp b/SU2_CFD/src/variable_linearized_turbulent.cpp index 88a54240573..3107be3da70 100644 --- a/SU2_CFD/src/variable_linearized_turbulent.cpp +++ b/SU2_CFD/src/variable_linearized_turbulent.cpp @@ -2,7 +2,7 @@ * \file variable_linearized_turbulent.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_structure.cpp b/SU2_CFD/src/variable_structure.cpp index 71f9fcb9330..f3756ecf7eb 100644 --- a/SU2_CFD/src/variable_structure.cpp +++ b/SU2_CFD/src/variable_structure.cpp @@ -2,7 +2,7 @@ * \file variable_structure.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_CFD/src/variable_template.cpp b/SU2_CFD/src/variable_template.cpp index 9c352660197..c0e0b031688 100644 --- a/SU2_CFD/src/variable_template.cpp +++ b/SU2_CFD/src/variable_template.cpp @@ -2,7 +2,7 @@ * \file variable_template.cpp * \brief Definition of the solution fields. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_DDC/obj/Makefile.am b/SU2_DDC/obj/Makefile.am deleted file mode 100644 index f9d9aae77cd..00000000000 --- a/SU2_DDC/obj/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# SU^2 Makefile.am for DDC -# Stanford University Aerospace Design Lab -# -# Created: 10/26/12 -# Last updated: 3/12/13 -# -# Created by: M. Colonno -# Updated by: M. Colonno -# -########################## - -# AUTOMAKE_OPTIONS = subdir-objects -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} - -bin_PROGRAMS = ../bin/SU2_DDC - -___bin_SU2_DDC_SOURCES = ../include/SU2_DDC.hpp \ - ../src/SU2_DDC.cpp - -___bin_SU2_DDC_CXXFLAGS = -___bin_SU2_DDC_LDADD = ../../Common/lib/libSU2.a - -# always link to built dependencies from ./externals -___bin_SU2_DDC_CXXFLAGS += @su2_externals_INCLUDES@ -___bin_SU2_DDC_LDADD += @su2_externals_LIBS@ - -# if BUILD_CGNS -___bin_SU2_DDC_CXXFLAGS += @CGNS_CXX@ -___bin_SU2_DDC_LDADD += @CGNS_LD@ -# endif - -# if BUILD_MUTATIONPP -___bin_SU2_DDC_CXXFLAGS += @MUTATIONPP_CXX@ -___bin_SU2_DDC_LDADD += @MUTATIONPP_LD@ -# endif - -# if BUILD_JSONCPP -___bin_SU2_DDC_CXXFLAGS += @JSONCPP_CXX@ -___bin_SU2_DDC_LDADD += @JSONCPP_LD@ -# endif diff --git a/SU2_DDC/bin/.gitignore b/SU2_DEF/bin/.gitignore similarity index 100% rename from SU2_DDC/bin/.gitignore rename to SU2_DEF/bin/.gitignore diff --git a/SU2_DDC/include/SU2_DDC.hpp b/SU2_DEF/include/SU2_DEF.hpp similarity index 84% rename from SU2_DDC/include/SU2_DDC.hpp rename to SU2_DEF/include/SU2_DEF.hpp index db504e8d23c..cb2f86a72e4 100644 --- a/SU2_DDC/include/SU2_DDC.hpp +++ b/SU2_DEF/include/SU2_DEF.hpp @@ -1,9 +1,9 @@ /*! - * \file SU2_DDC.hpp - * \brief Headers of the main subroutines of the code SU2_DDC. - * The subroutines and functions are in the SU2_DDC.cpp file. + * \file SU2_DEF.hpp + * \brief Headers of the main subroutines of the code SU2_DEF. + * The subroutines and functions are in the SU2_DEF.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_DEF/obj/Makefile.am b/SU2_DEF/obj/Makefile.am new file mode 100644 index 00000000000..ebfdf91e732 --- /dev/null +++ b/SU2_DEF/obj/Makefile.am @@ -0,0 +1,40 @@ +# SU2 Makefile.am for MDC +# Stanford University Aerospace Design Lab +# +# Created: 10/26/12 +# Last updated: 3/12/13 +# +# Created by: M. Colonno +# Updated by: M. Colonno +# +########################## + +# AUTOMAKE_OPTIONS = subdir-objects +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +bin_PROGRAMS = ../bin/SU2_DEF + +___bin_SU2_DEF_SOURCES = ../include/SU2_DEF.hpp \ + ../src/SU2_DEF.cpp + +___bin_SU2_DEF_CXXFLAGS = +___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a + +# always link to built dependencies from ./externals +___bin_SU2_DEF_CXXFLAGS += @su2_externals_INCLUDES@ +___bin_SU2_DEF_LDADD += @su2_externals_LIBS@ + +# if BUILD_CGNS +___bin_SU2_DEF_CXXFLAGS += @CGNS_CXX@ +___bin_SU2_DEF_LDADD += @CGNS_LD@ +# endif + +# if BUILD_MUTATIONPP +___bin_SU2_DEF_CXXFLAGS += @MUTATIONPP_CXX@ +___bin_SU2_DEF_LDADD += @MUTATIONPP_LD@ +# endif + +# if BUILD_JSONCPP +___bin_SU2_DEF_CXXFLAGS += @JSONCPP_CXX@ +___bin_SU2_DEF_LDADD += @JSONCPP_LD@ +# endif diff --git a/SU2_MDC/obj/Makefile.in b/SU2_DEF/obj/Makefile.in similarity index 88% rename from SU2_MDC/obj/Makefile.in rename to SU2_DEF/obj/Makefile.in index 7363195b13b..b7695b79c00 100644 --- a/SU2_MDC/obj/Makefile.in +++ b/SU2_DEF/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for MDC +# SU2 Makefile.am for MDC # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -62,8 +62,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_MDC$(EXEEXT) -subdir = SU2_MDC/obj +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 @@ -78,10 +78,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_MDC_OBJECTS = ../src/___bin_SU2_MDC-SU2_MDC.$(OBJEXT) -___bin_SU2_MDC_OBJECTS = $(am____bin_SU2_MDC_OBJECTS) -___bin_SU2_MDC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_MDC_LINK = $(CXXLD) $(___bin_SU2_MDC_CXXFLAGS) $(CXXFLAGS) \ +am____bin_SU2_DEF_OBJECTS = ../src/___bin_SU2_DEF-SU2_DEF.$(OBJEXT) +___bin_SU2_DEF_OBJECTS = $(am____bin_SU2_DEF_OBJECTS) +___bin_SU2_DEF_DEPENDENCIES = ../../Common/lib/libSU2.a +___bin_SU2_DEF_LINK = $(CXXLD) $(___bin_SU2_DEF_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,8 +128,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(___bin_SU2_MDC_SOURCES) -DIST_SOURCES = $(___bin_SU2_MDC_SOURCES) +SOURCES = $(___bin_SU2_DEF_SOURCES) +DIST_SOURCES = $(___bin_SU2_DEF_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -258,8 +258,8 @@ top_srcdir = @top_srcdir@ # AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_MDC_SOURCES = ../include/SU2_MDC.hpp \ - ../src/SU2_MDC.cpp +___bin_SU2_DEF_SOURCES = ../include/SU2_DEF.hpp \ + ../src/SU2_DEF.cpp # always link to built dependencies from ./externals @@ -271,9 +271,9 @@ ___bin_SU2_MDC_SOURCES = ../include/SU2_MDC.hpp \ # endif # if BUILD_JSONCPP -___bin_SU2_MDC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ +___bin_SU2_DEF_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_MDC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ +___bin_SU2_DEF_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) all: all-am @@ -288,9 +288,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_MDC/obj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_DEF/obj/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_MDC/obj/Makefile + $(AUTOMAKE) --foreign SU2_DEF/obj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -355,14 +355,14 @@ clean-binPROGRAMS: ../src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ../src/$(DEPDIR) @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_MDC-SU2_MDC.$(OBJEXT): ../src/$(am__dirstamp) \ +../src/___bin_SU2_DEF-SU2_DEF.$(OBJEXT): ../src/$(am__dirstamp) \ ../src/$(DEPDIR)/$(am__dirstamp) ../bin/$(am__dirstamp): @$(MKDIR_P) ../bin @: > ../bin/$(am__dirstamp) -../bin/SU2_MDC$(EXEEXT): $(___bin_SU2_MDC_OBJECTS) $(___bin_SU2_MDC_DEPENDENCIES) $(EXTRA____bin_SU2_MDC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_MDC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_MDC_LINK) $(___bin_SU2_MDC_OBJECTS) $(___bin_SU2_MDC_LDADD) $(LIBS) +../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) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -371,7 +371,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -389,19 +389,19 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -../src/___bin_SU2_MDC-SU2_MDC.o: ../src/SU2_MDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MDC-SU2_MDC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Tpo -c -o ../src/___bin_SU2_MDC-SU2_MDC.o `test -f '../src/SU2_MDC.cpp' || echo '$(srcdir)/'`../src/SU2_MDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Tpo ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MDC.cpp' object='../src/___bin_SU2_MDC-SU2_MDC.o' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_DEF-SU2_DEF.o: ../src/SU2_DEF.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DEF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DEF-SU2_DEF.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Tpo -c -o ../src/___bin_SU2_DEF-SU2_DEF.o `test -f '../src/SU2_DEF.cpp' || echo '$(srcdir)/'`../src/SU2_DEF.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Tpo ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DEF.cpp' object='../src/___bin_SU2_DEF-SU2_DEF.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_MDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_MDC-SU2_MDC.o `test -f '../src/SU2_MDC.cpp' || echo '$(srcdir)/'`../src/SU2_MDC.cpp +@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.o `test -f '../src/SU2_DEF.cpp' || echo '$(srcdir)/'`../src/SU2_DEF.cpp -../src/___bin_SU2_MDC-SU2_MDC.obj: ../src/SU2_MDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MDC-SU2_MDC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Tpo -c -o ../src/___bin_SU2_MDC-SU2_MDC.obj `if test -f '../src/SU2_MDC.cpp'; then $(CYGPATH_W) '../src/SU2_MDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_MDC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Tpo ../src/$(DEPDIR)/___bin_SU2_MDC-SU2_MDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MDC.cpp' object='../src/___bin_SU2_MDC-SU2_MDC.obj' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_DEF-SU2_DEF.obj: ../src/SU2_DEF.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DEF_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DEF-SU2_DEF.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Tpo -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` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Tpo ../src/$(DEPDIR)/___bin_SU2_DEF-SU2_DEF.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DEF.cpp' object='../src/___bin_SU2_DEF-SU2_DEF.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_MDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_MDC-SU2_MDC.obj `if test -f '../src/SU2_MDC.cpp'; then $(CYGPATH_W) '../src/SU2_MDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_MDC.cpp'; fi` +@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)'; \ diff --git a/SU2_MDC/src/SU2_MDC.cpp b/SU2_DEF/src/SU2_DEF.cpp similarity index 93% rename from SU2_MDC/src/SU2_MDC.cpp rename to SU2_DEF/src/SU2_DEF.cpp index d2fbce99113..7f8eb42b8cf 100644 --- a/SU2_MDC/src/SU2_MDC.cpp +++ b/SU2_DEF/src/SU2_DEF.cpp @@ -1,8 +1,8 @@ /*! - * \file SU2_MDC.cpp - * \brief Main file of Mesh Deformation Code (SU2_MDC). + * \file SU2_DEF.cpp + * \brief Main file of Mesh Deformation Code (SU2_DEF). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -20,7 +20,7 @@ * License along with SU2. If not, see . */ -#include "../include/SU2_MDC.hpp" +#include "../include/SU2_DEF.hpp" using namespace std; int main(int argc, char *argv[]) { @@ -53,10 +53,10 @@ int main(int argc, char *argv[]) { /*--- Definition of the configuration class, and open the config file ---*/ - if (argc == 2) config[ZONE_0] = new CConfig(argv[1], SU2_MDC, ZONE_0, nZone, 0, VERB_HIGH); + if (argc == 2) config[ZONE_0] = new CConfig(argv[1], SU2_DEF, ZONE_0, nZone, 0, VERB_HIGH); else { strcpy (mesh_file, "default.cfg"); - config[ZONE_0] = new CConfig(mesh_file, SU2_MDC, ZONE_0, nZone, 0, VERB_HIGH); + config[ZONE_0] = new CConfig(mesh_file, SU2_DEF, ZONE_0, nZone, 0, VERB_HIGH); } #ifdef HAVE_MPI @@ -227,7 +227,7 @@ int main(int argc, char *argv[]) { /*--- Exit the solver cleanly ---*/ if (rank == MASTER_NODE) - cout << endl << "------------------------- Exit Success (SU2_MDC) ------------------------" << endl << endl; + cout << endl << "------------------------- Exit Success (SU2_DEF) ------------------------" << endl << endl; #ifdef HAVE_MPI /*--- Finalize MPI parallelization ---*/ diff --git a/SU2_GDC/bin/.gitignore b/SU2_DOT/bin/.gitignore similarity index 100% rename from SU2_GDC/bin/.gitignore rename to SU2_DOT/bin/.gitignore diff --git a/SU2_GPC/include/SU2_GPC.hpp b/SU2_DOT/include/SU2_DOT.hpp similarity index 84% rename from SU2_GPC/include/SU2_GPC.hpp rename to SU2_DOT/include/SU2_DOT.hpp index 1d46c741c78..e5d738e4e7f 100644 --- a/SU2_GPC/include/SU2_GPC.hpp +++ b/SU2_DOT/include/SU2_DOT.hpp @@ -1,9 +1,9 @@ /*! - * \file SU2_GPC.hpp - * \brief Headers of the main subroutines of the code SU2_GPC. - * The subroutines and functions are in the SU2_GPC.cpp file. + * \file SU2_DOT.hpp + * \brief Headers of the main subroutines of the code SU2_DOT. + * The subroutines and functions are in the SU2_DOT.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_DOT/obj/Makefile.am b/SU2_DOT/obj/Makefile.am new file mode 100644 index 00000000000..2f43582cc99 --- /dev/null +++ b/SU2_DOT/obj/Makefile.am @@ -0,0 +1,40 @@ +# SU2 Makefile.am for DOT +# Stanford University Aerospace Design Lab +# +# Created: 10/26/12 +# Last updated: 3/12/13 +# +# Created by: M. Colonno +# Updated by: M. Colonno +# +########################## + +# AUTOMAKE_OPTIONS = subdir-objects +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +bin_PROGRAMS = ../bin/SU2_DOT + +___bin_SU2_DOT_SOURCES = ../include/SU2_DOT.hpp \ + ../src/SU2_DOT.cpp + +___bin_SU2_DOT_CXXFLAGS = +___bin_SU2_DOT_LDADD = ../../Common/lib/libSU2.a + +# always link to built dependencies from ./externals +___bin_SU2_DOT_CXXFLAGS += @su2_externals_INCLUDES@ +___bin_SU2_DOT_LDADD += @su2_externals_LIBS@ + +# if BUILD_CGNS +___bin_SU2_DOT_CXXFLAGS += @CGNS_CXX@ +___bin_SU2_DOT_LDADD += @CGNS_LD@ +# endif + +# if BUILD_MUTATIONPP +___bin_SU2_DOT_CXXFLAGS += @MUTATIONPP_CXX@ +___bin_SU2_DOT_LDADD += @MUTATIONPP_LD@ +# endif + +# if BUILD_JSONCPP +___bin_SU2_DOT_CXXFLAGS += @JSONCPP_CXX@ +___bin_SU2_DOT_LDADD += @JSONCPP_LD@ +# endif diff --git a/SU2_MAC/obj/Makefile.in b/SU2_DOT/obj/Makefile.in similarity index 88% rename from SU2_MAC/obj/Makefile.in rename to SU2_DOT/obj/Makefile.in index fbd718e54ed..e2f12f4b627 100644 --- a/SU2_MAC/obj/Makefile.in +++ b/SU2_DOT/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for MAC +# SU2 Makefile.am for DOT # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -62,8 +62,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_MAC$(EXEEXT) -subdir = SU2_MAC/obj +bin_PROGRAMS = ../bin/SU2_DOT$(EXEEXT) +subdir = SU2_DOT/obj DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -78,10 +78,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_MAC_OBJECTS = ../src/___bin_SU2_MAC-SU2_MAC.$(OBJEXT) -___bin_SU2_MAC_OBJECTS = $(am____bin_SU2_MAC_OBJECTS) -___bin_SU2_MAC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_MAC_LINK = $(CXXLD) $(___bin_SU2_MAC_CXXFLAGS) $(CXXFLAGS) \ +am____bin_SU2_DOT_OBJECTS = ../src/___bin_SU2_DOT-SU2_DOT.$(OBJEXT) +___bin_SU2_DOT_OBJECTS = $(am____bin_SU2_DOT_OBJECTS) +___bin_SU2_DOT_DEPENDENCIES = ../../Common/lib/libSU2.a +___bin_SU2_DOT_LINK = $(CXXLD) $(___bin_SU2_DOT_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,8 +128,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(___bin_SU2_MAC_SOURCES) -DIST_SOURCES = $(___bin_SU2_MAC_SOURCES) +SOURCES = $(___bin_SU2_DOT_SOURCES) +DIST_SOURCES = $(___bin_SU2_DOT_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -258,8 +258,8 @@ top_srcdir = @top_srcdir@ # AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_MAC_SOURCES = ../include/SU2_MAC.hpp \ - ../src/SU2_MAC.cpp +___bin_SU2_DOT_SOURCES = ../include/SU2_DOT.hpp \ + ../src/SU2_DOT.cpp # always link to built dependencies from ./externals @@ -271,9 +271,9 @@ ___bin_SU2_MAC_SOURCES = ../include/SU2_MAC.hpp \ # endif # if BUILD_JSONCPP -___bin_SU2_MAC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ +___bin_SU2_DOT_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_MAC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ +___bin_SU2_DOT_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) all: all-am @@ -288,9 +288,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_MAC/obj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_DOT/obj/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_MAC/obj/Makefile + $(AUTOMAKE) --foreign SU2_DOT/obj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -355,14 +355,14 @@ clean-binPROGRAMS: ../src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ../src/$(DEPDIR) @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_MAC-SU2_MAC.$(OBJEXT): ../src/$(am__dirstamp) \ +../src/___bin_SU2_DOT-SU2_DOT.$(OBJEXT): ../src/$(am__dirstamp) \ ../src/$(DEPDIR)/$(am__dirstamp) ../bin/$(am__dirstamp): @$(MKDIR_P) ../bin @: > ../bin/$(am__dirstamp) -../bin/SU2_MAC$(EXEEXT): $(___bin_SU2_MAC_OBJECTS) $(___bin_SU2_MAC_DEPENDENCIES) $(EXTRA____bin_SU2_MAC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_MAC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_MAC_LINK) $(___bin_SU2_MAC_OBJECTS) $(___bin_SU2_MAC_LDADD) $(LIBS) +../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) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -371,7 +371,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -389,19 +389,19 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -../src/___bin_SU2_MAC-SU2_MAC.o: ../src/SU2_MAC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MAC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MAC-SU2_MAC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Tpo -c -o ../src/___bin_SU2_MAC-SU2_MAC.o `test -f '../src/SU2_MAC.cpp' || echo '$(srcdir)/'`../src/SU2_MAC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Tpo ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MAC.cpp' object='../src/___bin_SU2_MAC-SU2_MAC.o' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_DOT-SU2_DOT.o: ../src/SU2_DOT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DOT_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DOT-SU2_DOT.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Tpo -c -o ../src/___bin_SU2_DOT-SU2_DOT.o `test -f '../src/SU2_DOT.cpp' || echo '$(srcdir)/'`../src/SU2_DOT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Tpo ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DOT.cpp' object='../src/___bin_SU2_DOT-SU2_DOT.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_MAC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_MAC-SU2_MAC.o `test -f '../src/SU2_MAC.cpp' || echo '$(srcdir)/'`../src/SU2_MAC.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DOT_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DOT-SU2_DOT.o `test -f '../src/SU2_DOT.cpp' || echo '$(srcdir)/'`../src/SU2_DOT.cpp -../src/___bin_SU2_MAC-SU2_MAC.obj: ../src/SU2_MAC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MAC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MAC-SU2_MAC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Tpo -c -o ../src/___bin_SU2_MAC-SU2_MAC.obj `if test -f '../src/SU2_MAC.cpp'; then $(CYGPATH_W) '../src/SU2_MAC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_MAC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Tpo ../src/$(DEPDIR)/___bin_SU2_MAC-SU2_MAC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MAC.cpp' object='../src/___bin_SU2_MAC-SU2_MAC.obj' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_DOT-SU2_DOT.obj: ../src/SU2_DOT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DOT_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DOT-SU2_DOT.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Tpo -c -o ../src/___bin_SU2_DOT-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` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Tpo ../src/$(DEPDIR)/___bin_SU2_DOT-SU2_DOT.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DOT.cpp' object='../src/___bin_SU2_DOT-SU2_DOT.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_MAC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_MAC-SU2_MAC.obj `if test -f '../src/SU2_MAC.cpp'; then $(CYGPATH_W) '../src/SU2_MAC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_MAC.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DOT_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DOT-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)'; \ diff --git a/SU2_GPC/src/SU2_GPC.cpp b/SU2_DOT/src/SU2_DOT.cpp similarity index 97% rename from SU2_GPC/src/SU2_GPC.cpp rename to SU2_DOT/src/SU2_DOT.cpp index 0261bc1d8a9..35ec4f667d9 100644 --- a/SU2_GPC/src/SU2_GPC.cpp +++ b/SU2_DOT/src/SU2_DOT.cpp @@ -1,8 +1,8 @@ /*! - * \file SU2_GPC.cpp - * \brief Main file of the Gradient Projection Code (SU2_GPC). + * \file SU2_DOT.cpp + * \brief Main file of the Gradient Projection Code (SU2_DOT). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -20,7 +20,7 @@ * License along with SU2. If not, see . */ -#include "../include/SU2_GPC.hpp" +#include "../include/SU2_DOT.hpp" using namespace std; int main(int argc, char *argv[]) { @@ -51,11 +51,11 @@ int main(int argc, char *argv[]) { /*--- Definition of the Class for the definition of the problem ---*/ - if (argc == 2) config = new CConfig(argv[1], SU2_GPC, ZONE_0, nZone, 0, VERB_HIGH); + if (argc == 2) config = new CConfig(argv[1], SU2_DOT, ZONE_0, nZone, 0, VERB_HIGH); else { char grid_file[200]; strcpy (grid_file, "default.cfg"); - config = new CConfig(grid_file, SU2_GPC, ZONE_0, nZone, 0, VERB_HIGH); + config = new CConfig(grid_file, SU2_DOT, ZONE_0, nZone, 0, VERB_HIGH); } #ifdef HAVE_MPI @@ -431,7 +431,7 @@ int main(int argc, char *argv[]) { /*--- End solver ---*/ if (rank == MASTER_NODE) - cout << endl <<"------------------------- Exit Success (SU2_GPC) ------------------------" << endl << endl; + cout << endl <<"------------------------- Exit Success (SU2_DOT) ------------------------" << endl << endl; return EXIT_SUCCESS; diff --git a/SU2_GDC/obj/Makefile.am b/SU2_GDC/obj/Makefile.am deleted file mode 100644 index ae21fcc58a8..00000000000 --- a/SU2_GDC/obj/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# SU^2 Makefile.am for GDC -# Stanford University Aerospace Design Lab -# -# Created: 3/16/13 -# Last updated: 4/09/13 -# -# Created by: M. Colonno -# Updated by: T. Economon -# -########################## - -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} - -bin_PROGRAMS = ../bin/SU2_GDC - -___bin_SU2_GDC_SOURCES = ../include/SU2_GDC.hpp \ - ../src/SU2_GDC.cpp - -___bin_SU2_GDC_CXXFLAGS = -___bin_SU2_GDC_LDADD = ../../Common/lib/libSU2.a - -# always link to built dependencies from ./externals -___bin_SU2_GDC_CXXFLAGS += @su2_externals_INCLUDES@ -___bin_SU2_GDC_LDADD += @su2_externals_LIBS@ - -# if BUILD_CGNS -___bin_SU2_GDC_CXXFLAGS += @CGNS_CXX@ -___bin_SU2_GDC_LDADD += @CGNS_LD@ -# endif - -# if BUILD_MUTATIONPP -___bin_SU2_GDC_CXXFLAGS += @MUTATIONPP_CXX@ -___bin_SU2_GDC_LDADD += @MUTATIONPP_LD@ -# endif - -# if BUILD_JSONCPP -___bin_SU2_GDC_CXXFLAGS += @JSONCPP_CXX@ -___bin_SU2_GDC_LDADD += @JSONCPP_LD@ -# endif diff --git a/SU2_GPC/bin/.gitignore b/SU2_GEO/bin/.gitignore similarity index 100% rename from SU2_GPC/bin/.gitignore rename to SU2_GEO/bin/.gitignore diff --git a/SU2_GDC/include/SU2_GDC.hpp b/SU2_GEO/include/SU2_GEO.hpp similarity index 84% rename from SU2_GDC/include/SU2_GDC.hpp rename to SU2_GEO/include/SU2_GEO.hpp index 6343a723573..562e3467f94 100644 --- a/SU2_GDC/include/SU2_GDC.hpp +++ b/SU2_GEO/include/SU2_GEO.hpp @@ -1,9 +1,9 @@ /*! - * \file SU2_GDC.hpp - * \brief Headers of the main subroutines of the code SU2_GDC. - * The subroutines and functions are in the SU2_GDC.cpp file. + * \file SU2_GEO.hpp + * \brief Headers of the main subroutines of the code SU2_GEO. + * The subroutines and functions are in the SU2_GEO.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_GEO/obj/Makefile.am b/SU2_GEO/obj/Makefile.am new file mode 100644 index 00000000000..0ad11facc93 --- /dev/null +++ b/SU2_GEO/obj/Makefile.am @@ -0,0 +1,39 @@ +# SU2 Makefile.am for GEO +# Stanford University Aerospace Design Lab +# +# Created: 3/16/13 +# Last updated: 4/09/13 +# +# Created by: M. Colonno +# Updated by: T. Economon +# +########################## + +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +bin_PROGRAMS = ../bin/SU2_GEO + +___bin_SU2_GEO_SOURCES = ../include/SU2_GEO.hpp \ + ../src/SU2_GEO.cpp + +___bin_SU2_GEO_CXXFLAGS = +___bin_SU2_GEO_LDADD = ../../Common/lib/libSU2.a + +# always link to built dependencies from ./externals +___bin_SU2_GEO_CXXFLAGS += @su2_externals_INCLUDES@ +___bin_SU2_GEO_LDADD += @su2_externals_LIBS@ + +# if BUILD_CGNS +___bin_SU2_GEO_CXXFLAGS += @CGNS_CXX@ +___bin_SU2_GEO_LDADD += @CGNS_LD@ +# endif + +# if BUILD_MUTATIONPP +___bin_SU2_GEO_CXXFLAGS += @MUTATIONPP_CXX@ +___bin_SU2_GEO_LDADD += @MUTATIONPP_LD@ +# endif + +# if BUILD_JSONCPP +___bin_SU2_GEO_CXXFLAGS += @JSONCPP_CXX@ +___bin_SU2_GEO_LDADD += @JSONCPP_LD@ +# endif diff --git a/SU2_GDC/obj/Makefile.in b/SU2_GEO/obj/Makefile.in similarity index 88% rename from SU2_GDC/obj/Makefile.in rename to SU2_GEO/obj/Makefile.in index 4098ff2540d..763f48a7d95 100644 --- a/SU2_GDC/obj/Makefile.in +++ b/SU2_GEO/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for GDC +# SU2 Makefile.am for GEO # Stanford University Aerospace Design Lab # # Created: 3/16/13 @@ -62,8 +62,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_GDC$(EXEEXT) -subdir = SU2_GDC/obj +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 @@ -78,10 +78,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_GDC_OBJECTS = ../src/___bin_SU2_GDC-SU2_GDC.$(OBJEXT) -___bin_SU2_GDC_OBJECTS = $(am____bin_SU2_GDC_OBJECTS) -___bin_SU2_GDC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_GDC_LINK = $(CXXLD) $(___bin_SU2_GDC_CXXFLAGS) $(CXXFLAGS) \ +am____bin_SU2_GEO_OBJECTS = ../src/___bin_SU2_GEO-SU2_GEO.$(OBJEXT) +___bin_SU2_GEO_OBJECTS = $(am____bin_SU2_GEO_OBJECTS) +___bin_SU2_GEO_DEPENDENCIES = ../../Common/lib/libSU2.a +___bin_SU2_GEO_LINK = $(CXXLD) $(___bin_SU2_GEO_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,8 +128,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(___bin_SU2_GDC_SOURCES) -DIST_SOURCES = $(___bin_SU2_GDC_SOURCES) +SOURCES = $(___bin_SU2_GEO_SOURCES) +DIST_SOURCES = $(___bin_SU2_GEO_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -256,8 +256,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_GDC_SOURCES = ../include/SU2_GDC.hpp \ - ../src/SU2_GDC.cpp +___bin_SU2_GEO_SOURCES = ../include/SU2_GEO.hpp \ + ../src/SU2_GEO.cpp # always link to built dependencies from ./externals @@ -269,9 +269,9 @@ ___bin_SU2_GDC_SOURCES = ../include/SU2_GDC.hpp \ # endif # if BUILD_JSONCPP -___bin_SU2_GDC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ +___bin_SU2_GEO_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_GDC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ +___bin_SU2_GEO_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) all: all-am @@ -286,9 +286,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_GDC/obj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_GEO/obj/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_GDC/obj/Makefile + $(AUTOMAKE) --foreign SU2_GEO/obj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -353,14 +353,14 @@ clean-binPROGRAMS: ../src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ../src/$(DEPDIR) @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_GDC-SU2_GDC.$(OBJEXT): ../src/$(am__dirstamp) \ +../src/___bin_SU2_GEO-SU2_GEO.$(OBJEXT): ../src/$(am__dirstamp) \ ../src/$(DEPDIR)/$(am__dirstamp) ../bin/$(am__dirstamp): @$(MKDIR_P) ../bin @: > ../bin/$(am__dirstamp) -../bin/SU2_GDC$(EXEEXT): $(___bin_SU2_GDC_OBJECTS) $(___bin_SU2_GDC_DEPENDENCIES) $(EXTRA____bin_SU2_GDC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_GDC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_GDC_LINK) $(___bin_SU2_GDC_OBJECTS) $(___bin_SU2_GDC_LDADD) $(LIBS) +../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) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -369,7 +369,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -387,19 +387,19 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -../src/___bin_SU2_GDC-SU2_GDC.o: ../src/SU2_GDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GDC-SU2_GDC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Tpo -c -o ../src/___bin_SU2_GDC-SU2_GDC.o `test -f '../src/SU2_GDC.cpp' || echo '$(srcdir)/'`../src/SU2_GDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Tpo ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GDC.cpp' object='../src/___bin_SU2_GDC-SU2_GDC.o' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_GEO-SU2_GEO.o: ../src/SU2_GEO.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GEO_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GEO-SU2_GEO.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Tpo -c -o ../src/___bin_SU2_GEO-SU2_GEO.o `test -f '../src/SU2_GEO.cpp' || echo '$(srcdir)/'`../src/SU2_GEO.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Tpo ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GEO.cpp' object='../src/___bin_SU2_GEO-SU2_GEO.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_GDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_GDC-SU2_GDC.o `test -f '../src/SU2_GDC.cpp' || echo '$(srcdir)/'`../src/SU2_GDC.cpp +@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.o `test -f '../src/SU2_GEO.cpp' || echo '$(srcdir)/'`../src/SU2_GEO.cpp -../src/___bin_SU2_GDC-SU2_GDC.obj: ../src/SU2_GDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GDC-SU2_GDC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Tpo -c -o ../src/___bin_SU2_GDC-SU2_GDC.obj `if test -f '../src/SU2_GDC.cpp'; then $(CYGPATH_W) '../src/SU2_GDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_GDC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Tpo ../src/$(DEPDIR)/___bin_SU2_GDC-SU2_GDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GDC.cpp' object='../src/___bin_SU2_GDC-SU2_GDC.obj' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_GEO-SU2_GEO.obj: ../src/SU2_GEO.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GEO_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GEO-SU2_GEO.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Tpo -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` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Tpo ../src/$(DEPDIR)/___bin_SU2_GEO-SU2_GEO.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GEO.cpp' object='../src/___bin_SU2_GEO-SU2_GEO.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_GDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_GDC-SU2_GDC.obj `if test -f '../src/SU2_GDC.cpp'; then $(CYGPATH_W) '../src/SU2_GDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_GDC.cpp'; fi` +@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)'; \ diff --git a/SU2_GDC/src/SU2_GDC.cpp b/SU2_GEO/src/SU2_GEO.cpp similarity index 98% rename from SU2_GDC/src/SU2_GDC.cpp rename to SU2_GEO/src/SU2_GEO.cpp index ed64a6fc94d..571896272b7 100644 --- a/SU2_GDC/src/SU2_GDC.cpp +++ b/SU2_GEO/src/SU2_GEO.cpp @@ -1,8 +1,8 @@ /*! - * \file SU2_GDC.cpp - * \brief Main file of the Geometry Definition Code (SU2_GDC). + * \file SU2_GEO.cpp + * \brief Main file of the Geometry Definition Code (SU2_GEO). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -20,7 +20,7 @@ * License along with SU2. If not, see . */ -#include "../include/SU2_GDC.hpp" +#include "../include/SU2_GEO.hpp" using namespace std; int main(int argc, char *argv[]) { @@ -55,10 +55,10 @@ int main(int argc, char *argv[]) { /*--- Definition of the class for the definition of the problem ---*/ - if (argc == 2) config = new CConfig(argv[1], SU2_GDC, ZONE_0, nZone, 0, VERB_HIGH); + if (argc == 2) config = new CConfig(argv[1], SU2_GEO, ZONE_0, nZone, 0, VERB_HIGH); else { strcpy (grid_file, "default.cfg"); - config = new CConfig(grid_file, SU2_GDC, ZONE_0, nZone, 0, VERB_HIGH); + config = new CConfig(grid_file, SU2_GEO, ZONE_0, nZone, 0, VERB_HIGH); } /*--- Change the name of the input-output files for the parallel computation ---*/ @@ -210,7 +210,7 @@ int main(int argc, char *argv[]) { cstr = new char [config->GetObjFunc_Value_FileName().size()+1]; strcpy (cstr, config->GetObjFunc_Value_FileName().c_str()); ObjFunc_file.open(cstr, ios::out); - ObjFunc_file << "TITLE = \"SU2_GDC Simulation\"" << endl; + ObjFunc_file << "TITLE = \"SU2_GEO Simulation\"" << endl; if (boundary->GetnDim() == 2) { ObjFunc_file << "VARIABLES = \"MAX_THICKNESS\",\"1/4_THICKNESS\",\"1/3_THICKNESS\",\"1/2_THICKNESS\",\"2/3_THICKNESS\",\"3/4_THICKNESS\",\"AREA\",\"AOA\",\"CHORD\",\"VOLUME\"" << endl; @@ -490,7 +490,7 @@ int main(int argc, char *argv[]) { cout << "\nInternal volume gradient: " << Volume_Grad << "." << endl; if (iDV == 0) { - Gradient_file << "TITLE = \"SU2_GDC Simulation\"" << endl; + Gradient_file << "TITLE = \"SU2_GEO Simulation\"" << endl; if (boundary->GetnDim() == 2) { Gradient_file << "VARIABLES = \"DESIGN_VARIABLE\",\"MAX_THICKNESS\",\"1/4_THICKNESS\",\"1/3_THICKNESS\",\"1/2_THICKNESS\",\"2/3_THICKNESS\",\"3/4_THICKNESS\",\"AREA\",\"AOA\",\"CHORD\",\"VOLUME\"" << endl; @@ -555,7 +555,7 @@ int main(int argc, char *argv[]) { /*--- End solver ---*/ if (rank == MASTER_NODE) - cout << endl <<"------------------------- Exit Success (SU2_GDC) ------------------------" << endl << endl; + cout << endl <<"------------------------- Exit Success (SU2_GEO) ------------------------" << endl << endl; return EXIT_SUCCESS; diff --git a/SU2_GPC/obj/Makefile.am b/SU2_GPC/obj/Makefile.am deleted file mode 100644 index 9d08ceb8b9e..00000000000 --- a/SU2_GPC/obj/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# SU^2 Makefile.am for GPC -# Stanford University Aerospace Design Lab -# -# Created: 10/26/12 -# Last updated: 3/12/13 -# -# Created by: M. Colonno -# Updated by: M. Colonno -# -########################## - -# AUTOMAKE_OPTIONS = subdir-objects -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} - -bin_PROGRAMS = ../bin/SU2_GPC - -___bin_SU2_GPC_SOURCES = ../include/SU2_GPC.hpp \ - ../src/SU2_GPC.cpp - -___bin_SU2_GPC_CXXFLAGS = -___bin_SU2_GPC_LDADD = ../../Common/lib/libSU2.a - -# always link to built dependencies from ./externals -___bin_SU2_GPC_CXXFLAGS += @su2_externals_INCLUDES@ -___bin_SU2_GPC_LDADD += @su2_externals_LIBS@ - -# if BUILD_CGNS -___bin_SU2_GPC_CXXFLAGS += @CGNS_CXX@ -___bin_SU2_GPC_LDADD += @CGNS_LD@ -# endif - -# if BUILD_MUTATIONPP -___bin_SU2_GPC_CXXFLAGS += @MUTATIONPP_CXX@ -___bin_SU2_GPC_LDADD += @MUTATIONPP_LD@ -# endif - -# if BUILD_JSONCPP -___bin_SU2_GPC_CXXFLAGS += @JSONCPP_CXX@ -___bin_SU2_GPC_LDADD += @JSONCPP_LD@ -# endif diff --git a/SU2_IDE/VisualStudio/SU2.lib/SU2.lib.vcxproj b/SU2_IDE/VisualStudio/SU2.lib/SU2.lib.vcxproj index 712db5e2656..fbb13a1fb78 100644 --- a/SU2_IDE/VisualStudio/SU2.lib/SU2.lib.vcxproj +++ b/SU2_IDE/VisualStudio/SU2.lib/SU2.lib.vcxproj @@ -124,29 +124,29 @@ - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel\ + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel\ - ..\..\..\Common\lib\Windows\64-bit\SU^2\Serial\ + ..\..\..\Common\lib\Windows\64-bit\SU2\Serial\ - SU^2 + SU2 - SU^2 + SU2 - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial\ + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial\ - SU^2 + SU2 .lib - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel\ - SU^2 + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel\ + SU2 diff --git a/SU2_IDE/VisualStudio/SU2.sln b/SU2_IDE/VisualStudio/SU2.sln index 012c7581de8..129dc177275 100644 --- a/SU2_IDE/VisualStudio/SU2.sln +++ b/SU2_IDE/VisualStudio/SU2.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2.lib", "SU2.lib\SU2.lib.vcxproj", "{651B28DB-9681-4E8B-8171-0A1440DBF4E0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_DDC", "SU2_DDC\SU2_DDC.vcxproj", "{B068C043-A7E3-4C59-8558-B380419E8FDE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_PRT", "SU2_PRT\SU2_PRT.vcxproj", "{B068C043-A7E3-4C59-8558-B380419E8FDE}" ProjectSection(ProjectDependencies) = postProject {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection @@ -13,22 +13,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_CFD", "SU2_CFD\SU2_CFD. {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_GPC", "SU2_GPC\SU2_GPC.vcxproj", "{DE1B3BA1-E394-40C1-99D1-4583FD5E1963}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_DOT", "SU2_DOT\SU2_DOT.vcxproj", "{DE1B3BA1-E394-40C1-99D1-4583FD5E1963}" ProjectSection(ProjectDependencies) = postProject {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_MAC", "SU2_MAC\SU2_MAC.vcxproj", "{47F0FA83-8DAB-4E84-89A6-93740E8B58E6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_MSH", "SU2_MSH\SU2_MSH.vcxproj", "{47F0FA83-8DAB-4E84-89A6-93740E8B58E6}" ProjectSection(ProjectDependencies) = postProject {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_MDC", "SU2_MDC\SU2_MDC.vcxproj", "{E6D6C33B-54D4-4B12-845F-DF74E27B3156}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_DEF", "SU2_DEF\SU2_DEF.vcxproj", "{E6D6C33B-54D4-4B12-845F-DF74E27B3156}" ProjectSection(ProjectDependencies) = postProject {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_PBC", "SU2_PBC\SU2_PBC.vcxproj", "{96E453D2-CE07-4837-93EC-E704946792C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_MSH", "SU2_MSH\SU2_MSH.vcxproj", "{96E453D2-CE07-4837-93EC-E704946792C7}" ProjectSection(ProjectDependencies) = postProject {651B28DB-9681-4E8B-8171-0A1440DBF4E0} = {651B28DB-9681-4E8B-8171-0A1440DBF4E0} EndProjectSection @@ -41,7 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_SOL", "SU2_SOL\SU2_SOL. {321107EE-9D20-416E-995B-413F6AE8FC64} = {321107EE-9D20-416E-995B-413F6AE8FC64} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_GDC", "SU2_GDC\SU2_GDC.vcxproj", "{AD4D2F03-E49D-4A4D-85B5-5616221D253E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_GEO", "SU2_GEO\SU2_GEO.vcxproj", "{AD4D2F03-E49D-4A4D-85B5-5616221D253E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SU2_SMC", "SU2_SMC\SU2_SMC.vcxproj", "{9CAE5EF2-14B1-408B-8308-6268D191545E}" EndProject diff --git a/SU2_IDE/VisualStudio/SU2.vcxproj b/SU2_IDE/VisualStudio/SU2.vcxproj index b06ff21e95c..6c179c06bd5 100644 --- a/SU2_IDE/VisualStudio/SU2.vcxproj +++ b/SU2_IDE/VisualStudio/SU2.vcxproj @@ -95,7 +95,7 @@ MaxSpeed true true - C:\Users\mcolonno\Desktop\Software\CGNS\3.1.3\src;C:\Users\mcolonno\Desktop\Software\Metis\5.0.2\include;C:\Users\mcolonno\Desktop\Software\MPICH2\include;C:\Users\mcolonno\Desktop\Software\Stanford\SU^2\trunk\Common\include;%(AdditionalIncludeDirectories) + C:\Users\mcolonno\Desktop\Software\CGNS\3.1.3\src;C:\Users\mcolonno\Desktop\Software\Metis\5.0.2\include;C:\Users\mcolonno\Desktop\Software\MPICH2\include;C:\Users\mcolonno\Desktop\Software\Stanford\SU2\trunk\Common\include;%(AdditionalIncludeDirectories) true @@ -121,8 +121,8 @@ true true true - C:\Users\mcolonno\Desktop\Software\MPICH2\lib;C:\Users\mcolonno\Desktop\Software\Stanford\SU^2\Windows\SU2.lib\x64\Release;%(AdditionalLibraryDirectories) - SU^2.lib;mpi.lib;cxx.lib;%(AdditionalDependencies) + C:\Users\mcolonno\Desktop\Software\MPICH2\lib;C:\Users\mcolonno\Desktop\Software\Stanford\SU2\Windows\SU2.lib\x64\Release;%(AdditionalLibraryDirectories) + SU2.lib;mpi.lib;cxx.lib;%(AdditionalDependencies) MSVCRT diff --git a/SU2_IDE/VisualStudio/SU2_CFD/SU2_CFD.vcxproj b/SU2_IDE/VisualStudio/SU2_CFD/SU2_CFD.vcxproj index c21a3c94eab..ff1d0b27893 100644 --- a/SU2_IDE/VisualStudio/SU2_CFD/SU2_CFD.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_CFD/SU2_CFD.vcxproj @@ -219,8 +219,8 @@ true true true - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) @@ -238,8 +238,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -258,8 +258,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) - SU^2.lib;tecio.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) + SU2.lib;tecio.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) @@ -281,8 +281,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;tecio.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;tecio.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) diff --git a/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj b/SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj similarity index 82% rename from SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj rename to SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj index 5546a91d051..a91470419b3 100644 --- a/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj @@ -27,14 +27,14 @@ - + - + {E6D6C33B-54D4-4B12-845F-DF74E27B3156} - SU2_MDC + SU2_DEF @@ -138,8 +138,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -157,8 +157,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -176,8 +176,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -197,8 +197,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj.filters similarity index 86% rename from SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj.filters rename to SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj.filters index 072269bc4c8..1ccabcb4180 100644 --- a/SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj.filters +++ b/SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj.filters @@ -15,12 +15,12 @@ - + Header Files - + Source Files diff --git a/SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj.user similarity index 100% rename from SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj.user rename to SU2_IDE/VisualStudio/SU2_DEF/SU2_DEF.vcxproj.user diff --git a/SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj b/SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj similarity index 82% rename from SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj rename to SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj index 2e6d57b68c1..8bc8d375d81 100644 --- a/SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj @@ -27,14 +27,14 @@ - + - + {DE1B3BA1-E394-40C1-99D1-4583FD5E1963} - SU2_GPC + SU2_DOT @@ -138,8 +138,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -157,8 +157,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -176,8 +176,8 @@ true true true - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) @@ -196,8 +196,8 @@ true true true - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) diff --git a/SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj.filters similarity index 86% rename from SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj.filters rename to SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj.filters index a063e9ec4e2..c7a211ce86b 100644 --- a/SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj.filters +++ b/SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj.filters @@ -15,12 +15,12 @@ - + Header Files - + Source Files diff --git a/SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj.user similarity index 100% rename from SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj.user rename to SU2_IDE/VisualStudio/SU2_DOT/SU2_DOT.vcxproj.user diff --git a/SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj b/SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj similarity index 82% rename from SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj rename to SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj index a13394fea40..86d9ddea9b6 100644 --- a/SU2_IDE/VisualStudio/SU2_GDC/SU2_GDC.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj @@ -27,15 +27,15 @@ - + - + {AD4D2F03-E49D-4A4D-85B5-5616221D253E} - SU2_GDC - SU2_GDC + SU2_GEO + SU2_GEO @@ -139,8 +139,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -158,8 +158,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -177,8 +177,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -198,8 +198,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj.filters similarity index 86% rename from SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj.filters rename to SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj.filters index 0467b895ee1..009c4ebd1f6 100644 --- a/SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj.filters +++ b/SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj.filters @@ -15,12 +15,12 @@ - + Header Files - + Source Files diff --git a/SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj.user similarity index 100% rename from SU2_IDE/VisualStudio/SU2_GPC/SU2_GPC.vcxproj.user rename to SU2_IDE/VisualStudio/SU2_GEO/SU2_GEO.vcxproj.user diff --git a/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.filters deleted file mode 100644 index c06235c0048..00000000000 --- a/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj b/SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj similarity index 82% rename from SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj rename to SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj index d8856b20974..058c5fc4386 100644 --- a/SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj @@ -27,14 +27,14 @@ - + - + {47F0FA83-8DAB-4E84-89A6-93740E8B58E6} - SU2_MAC + SU2_MSH @@ -138,8 +138,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -157,8 +157,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -176,8 +176,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -197,8 +197,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj.filters similarity index 86% rename from SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj.filters rename to SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj.filters index 29f567caf77..4afe53393c3 100644 --- a/SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj.filters +++ b/SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj.filters @@ -15,12 +15,12 @@ - + Header Files - + Source Files diff --git a/SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj.user similarity index 100% rename from SU2_IDE/VisualStudio/SU2_MAC/SU2_MAC.vcxproj.user rename to SU2_IDE/VisualStudio/SU2_MSH/SU2_MSH.vcxproj.user diff --git a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj b/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj deleted file mode 100644 index 4e83fc665cf..00000000000 --- a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - MPI - Win32 - - - Release - MPI - x64 - - - Release - Serial - Win32 - - - Release - Serial - x64 - - - - - - - - - - {96E453D2-CE07-4837-93EC-E704946792C7} - SU2_PBC - - - - Application - true - MultiByte - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\trunk\bin\Windows\64-bit\Parallel\ - - - ..\..\trunk\bin\Windows\64-bit\Serial\ - - - ..\..\trunk\bin\Windows\32-bit\Serial\ - - - ..\..\trunk\bin\Windows\32-bit\Parallel\ - - - - Level3 - Disabled - - - true - - - - - Level3 - Disabled - - - true - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include\MPICH2\1.4.1p1;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - MultiThreaded - GenerateParallelCode - /DMETIS_5 /traceback %(AdditionalOptions) - - - true - true - true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - MultiThreaded - GenerateParallelCode - /DMETIS_5 /DNO_MPI /traceback %(AdditionalOptions) - - - true - true - true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include\MPICH2\1.4.1p1;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - /DMETIS_5 /traceback %(AdditionalOptions) - MultiThreaded - GenerateParallelCode - - - true - true - true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - Disabled - true - true - ..\..\Common\include\CGNS\3.1.3;..\..\Common\include\METIS\5.0.2;..\..\Common\include;%(AdditionalIncludeDirectories) - true - /DMETIS_5 /DNO_MPI /DNO_MUTATIONPP /traceback %(AdditionalOptions) - MultiThreaded - GenerateParallelCode - NoIPO - - - true - true - true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.filters deleted file mode 100644 index 6577acc571a..00000000000 --- a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.user deleted file mode 100644 index 695b5c78b91..00000000000 --- a/SU2_IDE/VisualStudio/SU2_PBC/SU2_PBC.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj b/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj similarity index 82% rename from SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj rename to SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj index 47ecf81b199..185ce89ce75 100644 --- a/SU2_IDE/VisualStudio/SU2_DDC/SU2_DDC.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj @@ -27,14 +27,14 @@ - + - + {B068C043-A7E3-4C59-8558-B380419E8FDE} - SU2_DDC + SU2_PRT @@ -138,8 +138,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -157,8 +157,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -176,8 +176,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -196,8 +196,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.filters new file mode 100644 index 00000000000..726357b8ee8 --- /dev/null +++ b/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.user similarity index 100% rename from SU2_IDE/VisualStudio/SU2_MDC/SU2_MDC.vcxproj.user rename to SU2_IDE/VisualStudio/SU2_PRT/SU2_PRT.vcxproj.user diff --git a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj b/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj deleted file mode 100644 index 707b2c1dc12..00000000000 --- a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - MPI - Win32 - - - Release - MPI - x64 - - - Release - Serial - Win32 - - - Release - Serial - x64 - - - - - - - - - - {9CAE5EF2-14B1-408B-8308-6268D191545E} - SU2_SMC - - - - Application - true - MultiByte - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\trunk\bin\Windows\64-bit\Parallel\ - - - ..\..\trunk\bin\Windows\64-bit\Serial\ - - - ..\..\trunk\bin\Windows\32-bit\Serial\ - - - ..\..\trunk\bin\Windows\32-bit\Parallel\ - - - - Level3 - Disabled - - - true - - - - - Level3 - Disabled - - - true - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include\MPICH2\1.4.1p1;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - MultiThreaded - GenerateParallelCode - /DMETIS_5 /traceback %(AdditionalOptions) - - - true - true - true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - MultiThreaded - /DMETIS_5 /DNO_MPI /traceback %(AdditionalOptions) - GenerateParallelCode - - - true - true - true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - ..\..\trunk\Common\include\CGNS\3.1.3;..\..\trunk\Common\include\METIS\5.0.2;..\..\trunk\Common\include\MPICH2\1.4.1p1;..\..\trunk\Common\include;%(AdditionalIncludeDirectories) - true - /DMETIS_5 %(AdditionalOptions) - MultiThreaded - GenerateParallelCode - - - true - true - true - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - - - - - Level3 - Disabled - true - true - ..\..\Common\include\CGNS\3.1.3;..\..\Common\include\METIS\5.0.2;..\..\Common\include;%(AdditionalIncludeDirectories) - true - /DMETIS_5 /DNO_MPI /DNO_MUTATIONPP /traceback %(AdditionalOptions) - MultiThreaded - NoIPO - - - true - true - true - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - - - - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.filters b/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.filters deleted file mode 100644 index 5ad8f7b8860..00000000000 --- a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.user b/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.user deleted file mode 100644 index 695b5c78b91..00000000000 --- a/SU2_IDE/VisualStudio/SU2_SMC/SU2_SMC.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/SU2_IDE/VisualStudio/SU2_SOL/SU2_SOL.vcxproj b/SU2_IDE/VisualStudio/SU2_SOL/SU2_SOL.vcxproj index d6a249bea8c..1ced4119e82 100644 --- a/SU2_IDE/VisualStudio/SU2_SOL/SU2_SOL.vcxproj +++ b/SU2_IDE/VisualStudio/SU2_SOL/SU2_SOL.vcxproj @@ -151,8 +151,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\32-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -170,8 +170,8 @@ true true true - ..\..\trunk\Common\lib\Windows\32-bit\SU^2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\32-bit\SU2\Serial;..\..\trunk\Common\lib\Windows\32-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\32-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -189,8 +189,8 @@ true true true - ..\..\trunk\Common\lib\Windows\64-bit\SU^2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) - SU^2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\trunk\Common\lib\Windows\64-bit\SU2\Parallel;..\..\trunk\Common\lib\Windows\64-bit\MPICH2\1.4.1p1;..\..\trunk\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\trunk\Common\lib\Windows\64-bit\METIS\5.0.2;%(AdditionalLibraryDirectories) + SU2.lib;cgns.lib;metis.lib;mpi.lib;cxx.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -210,8 +210,8 @@ true true true - ..\..\Common\lib\Windows\64-bit\SU^2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) - SU^2.lib;tecio.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\Common\lib\Windows\64-bit\SU2\Serial;..\..\Common\lib\Windows\64-bit\CGNS\3.1.3;..\..\Common\lib\Windows\64-bit\METIS\5.0.2;C:\Program Files\Tecplot\bin;%(AdditionalLibraryDirectories) + SU2.lib;tecio.lib;cgns.lib;metis.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) diff --git a/SU2_IDE/Wing/SU2_Wing.wpr b/SU2_IDE/Wing/SU2_Wing.wpr index 3fe43b60892..0332727ca1c 100644 --- a/SU2_IDE/Wing/SU2_Wing.wpr +++ b/SU2_IDE/Wing/SU2_Wing.wpr @@ -988,7 +988,7 @@ guimgr.visual-state = {loc('../../../../.cache/wingide4/pi-cache/2.7/usr/local/l 'sel-line-start': 0, 'selection_end': 0, 'selection_start': 0}, - loc('../trunk/SU2Py/SU2_MAC'): {'attrib-starts': [], + loc('../trunk/SU2Py/SU2_MSH'): {'attrib-starts': [], 'first-line': 0, 'folded-linenos': [], 'sel-line': 0, diff --git a/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcshareddata/SU2_CFD.xccheckout b/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcshareddata/SU2_CFD.xccheckout index dcbc8bed305..9b6d493e2f3 100644 --- a/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcshareddata/SU2_CFD.xccheckout +++ b/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcshareddata/SU2_CFD.xccheckout @@ -5,7 +5,7 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - ADCAAB52-5246-4373-A2C0-61F6731CB4C1 + 184E1723-904F-4BC0-A8B6-BC06E4DE0542 IDESourceControlProjectName SU2_CFD IDESourceControlProjectOriginsDictionary diff --git a/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate index 4feca20195f99bd07eda477b071302e6c431b4ed..e3e9866a72b0aa4d66236e51776f40a42d475b9d 100644 GIT binary patch delta 28295 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 H^67s7^+Yb3 delta 28831 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 C{@uL* diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 13ea2d0a46df0e03d2517c74b9e7d6748bccb0cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54168 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 - - - - BuildLocationStyle - UseAppPreferences - CustomBuildLocationType - RelativeToDerivedData - DerivedDataCustomLocation - DerivedData - DerivedDataLocationStyle - WorkspaceRelativePath - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - IssueFilterStyle - ShowActiveSchemeOnly - LiveSourceIssuesEnabled - - SnapshotAutomaticallyBeforeSignificantChanges - - SnapshotLocationStyle - Default - - diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index 05301bc2538..00000000000 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_DDC.xcscheme b/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_DDC.xcscheme deleted file mode 100644 index 453bd22f5cd..00000000000 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_DDC.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 0c3e119adb3..00000000000 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,37 +0,0 @@ - - - - - SchemeUserState - - SU2_DDC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 0514CF8016DE7F4E00ADB9D2 - - primary - - - 05E4143517600BED00A448E0 - - primary - - - 05E4144217600FBB00A448E0 - - primary - - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.mode1v3 similarity index 99% rename from SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.mode1v3 rename to SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.mode1v3 index def10a1daba..a505759f593 100644 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.mode1v3 +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.mode1v3 @@ -315,7 +315,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SU2_MDC.hpp + SU2_DEF.hpp PBXSplitModuleInNavigatorKey Split0 @@ -323,7 +323,7 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SU2_MDC.hpp + SU2_DEF.hpp _historyCapacity 0 bookmark @@ -547,7 +547,7 @@ WindowOrderList 050BACCD1374A5FB00564A35 - /Users/fpalacios/SU2/trunk/SU2_MDC/SU2_MDC.xcodeproj + /Users/fpalacios/SU2/trunk/SU2_DEF/SU2_DEF.xcodeproj WindowString 640 405 1280 653 0 0 1920 1058 diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.pbxuser similarity index 95% rename from SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.pbxuser rename to SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.pbxuser index febeaba4ebc..772e13ad1be 100644 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/fpalacios.pbxuser +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/fpalacios.pbxuser @@ -14,7 +14,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 050BACD31374A60900564A35 /* SU2_MDC */ = { + 050BACD31374A60900564A35 /* SU2_DEF */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -37,7 +37,7 @@ executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; libgmallocEnabled = 0; - name = SU2_MDC; + name = SU2_DEF; savedGlobals = { }; showTypeColumn = 0; @@ -46,14 +46,14 @@ variableFormatDictionary = { }; }; - 050BACDD1374A63100564A35 /* SU2_MDC.hpp */ = { + 050BACDD1374A63100564A35 /* SU2_DEF.hpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {898, 754}}"; sepNavSelRange = "{274, 0}"; sepNavVisRange = "{0, 1711}"; }; }; - 050BACDE1374A63500564A35 /* SU2_MDC.cpp */ = { + 050BACDE1374A63500564A35 /* SU2_DEF.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1055, 7475}}"; sepNavSelRange = "{190, 0}"; @@ -201,8 +201,8 @@ }; 0525614616D1EB5C003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 050BACDE1374A63500564A35 /* SU2_MDC.cpp */; - name = "SU2_MDC.cpp: 5"; + fRef = 050BACDE1374A63500564A35 /* SU2_DEF.cpp */; + name = "SU2_DEF.cpp: 5"; rLen = 0; rLoc = 190; rType = 0; @@ -211,8 +211,8 @@ }; 0525614716D1EB5C003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 050BACDD1374A63100564A35 /* SU2_MDC.hpp */; - name = "SU2_MDC.hpp: 14"; + fRef = 050BACDD1374A63100564A35 /* SU2_DEF.hpp */; + name = "SU2_DEF.hpp: 14"; rLen = 0; rLoc = 623; rType = 0; @@ -221,8 +221,8 @@ }; 0525614816D1EB5C003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 050BACDD1374A63100564A35 /* SU2_MDC.hpp */; - name = "SU2_MDC.hpp: 6"; + fRef = 050BACDD1374A63100564A35 /* SU2_DEF.hpp */; + name = "SU2_DEF.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -464,16 +464,16 @@ }; 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 050BACD31374A60900564A35 /* SU2_MDC */; - activeTarget = 8DD76F620486A84900D96B5E /* SU2_MDC */; + activeExecutable = 050BACD31374A60900564A35 /* SU2_DEF */; + activeTarget = 8DD76F620486A84900D96B5E /* SU2_DEF */; addToTargets = ( - 8DD76F620486A84900D96B5E /* SU2_MDC */, + 8DD76F620486A84900D96B5E /* SU2_DEF */, ); breakpoints = ( ); codeSenseManager = 050BACC71374A5F400564A35 /* Code sense */; executables = ( - 050BACD31374A60900564A35 /* SU2_MDC */, + 050BACD31374A60900564A35 /* SU2_DEF */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -539,10 +539,10 @@ userBuildSettings = { }; }; - 8DD76F620486A84900D96B5E /* SU2_MDC */ = { + 8DD76F620486A84900D96B5E /* SU2_DEF */ = { activeExec = 0; executables = ( - 050BACD31374A60900564A35 /* SU2_MDC */, + 050BACD31374A60900564A35 /* SU2_DEF */, ); }; } diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.pbxproj similarity index 91% rename from SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.pbxproj rename to SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.pbxproj index bca94e9115a..9835e799b6c 100644 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.pbxproj @@ -15,7 +15,7 @@ 05E6DB6217EB61D100FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB5917EB61D100FA1F7E /* matrix_structure.cpp */; }; 05E6DB6317EB61D100FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB5A17EB61D100FA1F7E /* primal_grid_structure.cpp */; }; 05E6DB6417EB61D100FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB5B17EB61D100FA1F7E /* vector_structure.cpp */; }; - 05E6DC4E17EB635D00FA1F7E /* SU2_MDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC4D17EB635D00FA1F7E /* SU2_MDC.cpp */; }; + 05E6DC4E17EB635D00FA1F7E /* SU2_DEF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC4D17EB635D00FA1F7E /* SU2_DEF.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -31,7 +31,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 050BACD21374A60900564A35 /* SU2_MDC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_MDC; sourceTree = BUILT_PRODUCTS_DIR; }; + 050BACD21374A60900564A35 /* SU2_DEF */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_DEF; sourceTree = BUILT_PRODUCTS_DIR; }; 05A9E2DD180DCD5200BFCFD2 /* config_template.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_template.cfg; path = ../../config_template.cfg; sourceTree = ""; }; 05E6DA8417EB5FD800FA1F7E /* config_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_structure.inl; path = ../../Common/include/config_structure.inl; sourceTree = ""; }; 05E6DA8517EB5FD800FA1F7E /* dual_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = dual_grid_structure.inl; path = ../../Common/include/dual_grid_structure.inl; sourceTree = ""; }; @@ -58,8 +58,8 @@ 05E6DB5917EB61D100FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; 05E6DB5A17EB61D100FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; 05E6DB5B17EB61D100FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC4C17EB635800FA1F7E /* SU2_MDC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_MDC.hpp; path = ../../SU2_MDC/include/SU2_MDC.hpp; sourceTree = ""; }; - 05E6DC4D17EB635D00FA1F7E /* SU2_MDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_MDC.cpp; path = ../../SU2_MDC/src/SU2_MDC.cpp; sourceTree = ""; }; + 05E6DC4C17EB635800FA1F7E /* SU2_DEF.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_DEF.hpp; path = ../../SU2_DEF/include/SU2_DEF.hpp; sourceTree = ""; }; + 05E6DC4D17EB635D00FA1F7E /* SU2_DEF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_DEF.cpp; path = ../../SU2_DEF/src/SU2_DEF.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +91,7 @@ 050BACD91374A61F00564A35 /* Include */ = { isa = PBXGroup; children = ( - 05E6DC4C17EB635800FA1F7E /* SU2_MDC.hpp */, + 05E6DC4C17EB635800FA1F7E /* SU2_DEF.hpp */, 05E6DAE317EB609400FA1F7E /* config_structure.hpp */, 05E6DAE417EB609400FA1F7E /* dual_grid_structure.hpp */, 05E6DAE517EB609400FA1F7E /* geometry_structure.hpp */, @@ -105,7 +105,7 @@ name = Include; sourceTree = ""; }; - 08FB7794FE84155DC02AAC07 /* SU2_MDC */ = { + 08FB7794FE84155DC02AAC07 /* SU2_DEF */ = { isa = PBXGroup; children = ( 05A9E2DD180DCD5200BFCFD2 /* config_template.cfg */, @@ -114,13 +114,13 @@ 08FB7795FE84155DC02AAC07 /* Source */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - name = SU2_MDC; + name = SU2_DEF; sourceTree = ""; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 05E6DC4D17EB635D00FA1F7E /* SU2_MDC.cpp */, + 05E6DC4D17EB635D00FA1F7E /* SU2_DEF.cpp */, 05E6DB5317EB61D100FA1F7E /* config_structure.cpp */, 05E6DB5417EB61D100FA1F7E /* dual_grid_structure.cpp */, 05E6DB5517EB61D100FA1F7E /* geometry_structure.cpp */, @@ -136,7 +136,7 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 050BACD21374A60900564A35 /* SU2_MDC */, + 050BACD21374A60900564A35 /* SU2_DEF */, ); name = Products; sourceTree = ""; @@ -144,9 +144,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76F620486A84900D96B5E /* SU2_MDC */ = { + 8DD76F620486A84900D96B5E /* SU2_DEF */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MDC" */; + buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_DEF" */; buildPhases = ( 8DD76F640486A84900D96B5E /* Sources */, 8DD76F660486A84900D96B5E /* Frameworks */, @@ -156,10 +156,10 @@ ); dependencies = ( ); - name = SU2_MDC; + name = SU2_DEF; productInstallPath = "$(HOME)/bin"; - productName = SU2_MDC; - productReference = 050BACD21374A60900564A35 /* SU2_MDC */; + productName = SU2_DEF; + productReference = 050BACD21374A60900564A35 /* SU2_DEF */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -168,9 +168,9 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0510; }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MDC" */; + buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DEF" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -180,11 +180,11 @@ French, German, ); - mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_MDC */; + mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_DEF */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DD76F620486A84900D96B5E /* SU2_MDC */, + 8DD76F620486A84900D96B5E /* SU2_DEF */, ); }; /* End PBXProject section */ @@ -202,7 +202,7 @@ 05E6DB6217EB61D100FA1F7E /* matrix_structure.cpp in Sources */, 05E6DB6317EB61D100FA1F7E /* primal_grid_structure.cpp in Sources */, 05E6DB6417EB61D100FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC4E17EB635D00FA1F7E /* SU2_MDC.cpp in Sources */, + 05E6DC4E17EB635D00FA1F7E /* SU2_DEF.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -218,7 +218,7 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 3; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_MDC; + PRODUCT_NAME = SU2_DEF; }; name = Debug; }; @@ -229,7 +229,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_MDC; + PRODUCT_NAME = SU2_DEF; }; name = Release; }; @@ -248,7 +248,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.8; + SDKROOT = macosx; }; name = Debug; }; @@ -258,14 +258,14 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx10.8; + SDKROOT = macosx; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MDC" */ = { + 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_DEF" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */, @@ -274,7 +274,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MDC" */ = { + 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DEF" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 71% rename from SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 6d7b0481fbe..bded3d35d06 100644 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:SU2_DEF.xcodeproj"> diff --git a/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_DEF.xccheckout b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_DEF.xccheckout new file mode 100644 index 00000000000..b15ed12db17 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_DEF.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + B1DBBE68-F926-4100-9E44-A680C21D3630 + IDESourceControlProjectName + SU2_DEF + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_MDC.xccheckout b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_MDC.xccheckout new file mode 100644 index 00000000000..98de6db4c12 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace/xcshareddata/SU2_MDC.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + A104F085-F6B9-48D5-A272-0F0E1518E54D + IDESourceControlProjectName + SU2_DEF + IDESourceControlProjectOriginsDictionary + + 24B501F7-54F5-42EE-A7B1-6B8695F8C969 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_DEF.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 24B501F7-54F5-42EE-A7B1-6B8695F8C969 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 24B501F7-54F5-42EE-A7B1-6B8695F8C969 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 24B501F7-54F5-42EE-A7B1-6B8695F8C969 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.mode1v3 similarity index 99% rename from SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.mode1v3 rename to SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.mode1v3 index eff49d660ed..d4488529f31 100644 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.mode1v3 +++ b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.mode1v3 @@ -315,7 +315,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SU2_GPC.hpp + SU2_DOT.hpp PBXSplitModuleInNavigatorKey Split0 @@ -323,7 +323,7 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SU2_GPC.hpp + SU2_DOT.hpp _historyCapacity 0 bookmark @@ -538,7 +538,7 @@ WindowOrderList 054673FC14EF44A4004209AC - /Users/fpalacios/SU2/trunk/SU2_GPC/SU2_GPC.xcodeproj + /Users/fpalacios/SU2/trunk/SU2_DOT/SU2_DOT.xcodeproj WindowString 305 148 1615 906 0 0 1920 1058 diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.pbxuser similarity index 93% rename from SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.pbxuser rename to SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.pbxuser index a12534c7af6..04ff4f9d4ba 100644 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/fpalacios.pbxuser +++ b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/fpalacios.pbxuser @@ -2,8 +2,8 @@ { 0525613A16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740414EF44C8004209AC /* SU2_GPC.cpp */; - name = "SU2_GPC.cpp: 5"; + fRef = 0546740414EF44C8004209AC /* SU2_DOT.cpp */; + name = "SU2_DOT.cpp: 5"; rLen = 0; rLoc = 193; rType = 0; @@ -12,8 +12,8 @@ }; 0525613B16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740B14EF44D7004209AC /* SU2_GPC.hpp */; - name = "SU2_GPC.hpp: 6"; + fRef = 0546740B14EF44D7004209AC /* SU2_DOT.hpp */; + name = "SU2_DOT.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -22,8 +22,8 @@ }; 0525613C16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740B14EF44D7004209AC /* SU2_GPC.hpp */; - name = "SU2_GPC.hpp: 6"; + fRef = 0546740B14EF44D7004209AC /* SU2_DOT.hpp */; + name = "SU2_DOT.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -40,7 +40,7 @@ vrLen = 1558; vrLoc = 5803; }; - 054673F314EF4494004209AC /* SU2_GPC */ = { + 054673F314EF4494004209AC /* SU2_DOT */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -63,7 +63,7 @@ executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; libgmallocEnabled = 0; - name = SU2_GPC; + name = SU2_DOT; savedGlobals = { }; showTypeColumn = 0; @@ -86,7 +86,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 0546740414EF44C8004209AC /* SU2_GPC.cpp */ = { + 0546740414EF44C8004209AC /* SU2_DOT.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1310, 4238}}"; sepNavSelRange = "{193, 0}"; @@ -94,7 +94,7 @@ sepNavWindowFrame = "{{15, 76}, {1348, 952}}"; }; }; - 0546740B14EF44D7004209AC /* SU2_GPC.hpp */ = { + 0546740B14EF44D7004209AC /* SU2_DOT.hpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1310, 828}}"; sepNavSelRange = "{274, 0}"; @@ -293,14 +293,14 @@ }; 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 054673F314EF4494004209AC /* SU2_GPC */; - activeTarget = 8DD76F620486A84900D96B5E /* SU2_GPC */; + activeExecutable = 054673F314EF4494004209AC /* SU2_DOT */; + activeTarget = 8DD76F620486A84900D96B5E /* SU2_DOT */; addToTargets = ( - 8DD76F620486A84900D96B5E /* SU2_GPC */, + 8DD76F620486A84900D96B5E /* SU2_DOT */, ); codeSenseManager = 054673F814EF449F004209AC /* Code sense */; executables = ( - 054673F314EF4494004209AC /* SU2_GPC */, + 054673F314EF4494004209AC /* SU2_DOT */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -345,10 +345,10 @@ userBuildSettings = { }; }; - 8DD76F620486A84900D96B5E /* SU2_GPC */ = { + 8DD76F620486A84900D96B5E /* SU2_DOT */ = { activeExec = 0; executables = ( - 054673F314EF4494004209AC /* SU2_GPC */, + 054673F314EF4494004209AC /* SU2_DOT */, ); }; } diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.pbxproj similarity index 92% rename from SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.pbxproj rename to SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.pbxproj index 45c4e6c68ec..6fa40241786 100644 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ 05E6DB2C17EB61BD00FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB2317EB61BD00FA1F7E /* matrix_structure.cpp */; }; 05E6DB2D17EB61BD00FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB2417EB61BD00FA1F7E /* primal_grid_structure.cpp */; }; 05E6DB2E17EB61BD00FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB2517EB61BD00FA1F7E /* vector_structure.cpp */; }; - 05E6DC5A17EB64E300FA1F7E /* SU2_GPC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5917EB64E300FA1F7E /* SU2_GPC.cpp */; }; + 05E6DC5A17EB64E300FA1F7E /* SU2_DOT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5917EB64E300FA1F7E /* SU2_DOT.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -60,9 +60,9 @@ 05E6DB2317EB61BD00FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; 05E6DB2417EB61BD00FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; 05E6DB2517EB61BD00FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC5817EB64DE00FA1F7E /* SU2_GPC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_GPC.hpp; path = ../../SU2_GPC/include/SU2_GPC.hpp; sourceTree = ""; }; - 05E6DC5917EB64E300FA1F7E /* SU2_GPC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_GPC.cpp; path = ../../SU2_GPC/src/SU2_GPC.cpp; sourceTree = ""; }; - 8DD76F6C0486A84900D96B5E /* SU2_GPC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_GPC; sourceTree = BUILT_PRODUCTS_DIR; }; + 05E6DC5817EB64DE00FA1F7E /* SU2_DOT.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_DOT.hpp; path = ../../SU2_DOT/include/SU2_DOT.hpp; sourceTree = ""; }; + 05E6DC5917EB64E300FA1F7E /* SU2_DOT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_DOT.cpp; path = ../../SU2_DOT/src/SU2_DOT.cpp; sourceTree = ""; }; + 8DD76F6C0486A84900D96B5E /* SU2_DOT */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_DOT; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,7 +79,7 @@ 0546740714EF44CD004209AC /* Include */ = { isa = PBXGroup; children = ( - 05E6DC5817EB64DE00FA1F7E /* SU2_GPC.hpp */, + 05E6DC5817EB64DE00FA1F7E /* SU2_DOT.hpp */, 05E6DB0117EB615700FA1F7E /* config_structure.hpp */, 05E6DB0217EB615700FA1F7E /* dual_grid_structure.hpp */, 05E6DB0317EB615700FA1F7E /* geometry_structure.hpp */, @@ -110,7 +110,7 @@ name = InLine; sourceTree = ""; }; - 08FB7794FE84155DC02AAC07 /* SU2_GPC */ = { + 08FB7794FE84155DC02AAC07 /* SU2_DOT */ = { isa = PBXGroup; children = ( 0546744114EF4587004209AC /* InLine */, @@ -118,13 +118,13 @@ 08FB7795FE84155DC02AAC07 /* Source */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - name = SU2_GPC; + name = SU2_DOT; sourceTree = ""; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 05E6DC5917EB64E300FA1F7E /* SU2_GPC.cpp */, + 05E6DC5917EB64E300FA1F7E /* SU2_DOT.cpp */, 05E6DB1D17EB61BD00FA1F7E /* config_structure.cpp */, 05E6DB1E17EB61BD00FA1F7E /* dual_grid_structure.cpp */, 05E6DB1F17EB61BD00FA1F7E /* geometry_structure.cpp */, @@ -141,7 +141,7 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8DD76F6C0486A84900D96B5E /* SU2_GPC */, + 8DD76F6C0486A84900D96B5E /* SU2_DOT */, ); name = Products; sourceTree = ""; @@ -149,9 +149,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76F620486A84900D96B5E /* SU2_GPC */ = { + 8DD76F620486A84900D96B5E /* SU2_DOT */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_GPC" */; + buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_DOT" */; buildPhases = ( 8DD76F640486A84900D96B5E /* Sources */, 8DD76F660486A84900D96B5E /* Frameworks */, @@ -161,10 +161,10 @@ ); dependencies = ( ); - name = SU2_GPC; + name = SU2_DOT; productInstallPath = "$(HOME)/bin"; - productName = SU2_GPC; - productReference = 8DD76F6C0486A84900D96B5E /* SU2_GPC */; + productName = SU2_DOT; + productReference = 8DD76F6C0486A84900D96B5E /* SU2_DOT */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -175,7 +175,7 @@ attributes = { LastUpgradeCheck = 0500; }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GPC" */; + buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DOT" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -185,11 +185,11 @@ French, German, ); - mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_GPC */; + mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_DOT */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DD76F620486A84900D96B5E /* SU2_GPC */, + 8DD76F620486A84900D96B5E /* SU2_DOT */, ); }; /* End PBXProject section */ @@ -208,7 +208,7 @@ 05E6DB2C17EB61BD00FA1F7E /* matrix_structure.cpp in Sources */, 05E6DB2D17EB61BD00FA1F7E /* primal_grid_structure.cpp in Sources */, 05E6DB2E17EB61BD00FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC5A17EB64E300FA1F7E /* SU2_GPC.cpp in Sources */, + 05E6DC5A17EB64E300FA1F7E /* SU2_DOT.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -224,7 +224,7 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_GPC; + PRODUCT_NAME = SU2_DOT; SDKROOT = ""; }; name = Debug; @@ -236,7 +236,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_GPC; + PRODUCT_NAME = SU2_DOT; SDKROOT = ""; }; name = Release; @@ -272,7 +272,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_GPC" */ = { + 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_DOT" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */, @@ -281,7 +281,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GPC" */ = { + 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DOT" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 71% rename from SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/contents.xcworkspacedata index ce51a835d3c..93672e1d442 100644 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:SU2_DOT.xcodeproj"> diff --git a/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DOT.xccheckout b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DOT.xccheckout new file mode 100644 index 00000000000..ff416690792 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DOT.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + BC12D70B-AE98-4EC0-8D27-9DEAB19B426B + IDESourceControlProjectName + SU2_DOT + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_DOT.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index dbeb13f8dcb09e35036cc7f0d11c3ca29d9714a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66257 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

x_r=%rEPDc7LeN^bT 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 - - - - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - SnapshotAutomaticallyBeforeSignificantChanges - - - diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index 05301bc2538..00000000000 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GDC.xcscheme b/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GDC.xcscheme deleted file mode 100644 index 0fe4839b5ad..00000000000 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GDC.xcscheme +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme b/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme deleted file mode 100644 index af3aaec54ba..00000000000 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index f8b26dbf725..00000000000 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SchemeUserState - - SU2_GDC.xcscheme - - orderHint - 1 - - SU2_GPC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 0562295317A70687006A083F - - primary - - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.mode1v3 similarity index 99% rename from SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.mode1v3 rename to SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.mode1v3 index eff49d660ed..d4488529f31 100644 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.mode1v3 +++ b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.mode1v3 @@ -315,7 +315,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SU2_GPC.hpp + SU2_DOT.hpp PBXSplitModuleInNavigatorKey Split0 @@ -323,7 +323,7 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SU2_GPC.hpp + SU2_DOT.hpp _historyCapacity 0 bookmark @@ -538,7 +538,7 @@ WindowOrderList 054673FC14EF44A4004209AC - /Users/fpalacios/SU2/trunk/SU2_GPC/SU2_GPC.xcodeproj + /Users/fpalacios/SU2/trunk/SU2_DOT/SU2_DOT.xcodeproj WindowString 305 148 1615 906 0 0 1920 1058 diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.pbxuser similarity index 93% rename from SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.pbxuser rename to SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.pbxuser index a12534c7af6..04ff4f9d4ba 100644 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/fpalacios.pbxuser +++ b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/fpalacios.pbxuser @@ -2,8 +2,8 @@ { 0525613A16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740414EF44C8004209AC /* SU2_GPC.cpp */; - name = "SU2_GPC.cpp: 5"; + fRef = 0546740414EF44C8004209AC /* SU2_DOT.cpp */; + name = "SU2_DOT.cpp: 5"; rLen = 0; rLoc = 193; rType = 0; @@ -12,8 +12,8 @@ }; 0525613B16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740B14EF44D7004209AC /* SU2_GPC.hpp */; - name = "SU2_GPC.hpp: 6"; + fRef = 0546740B14EF44D7004209AC /* SU2_DOT.hpp */; + name = "SU2_DOT.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -22,8 +22,8 @@ }; 0525613C16D1EB48003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 0546740B14EF44D7004209AC /* SU2_GPC.hpp */; - name = "SU2_GPC.hpp: 6"; + fRef = 0546740B14EF44D7004209AC /* SU2_DOT.hpp */; + name = "SU2_DOT.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -40,7 +40,7 @@ vrLen = 1558; vrLoc = 5803; }; - 054673F314EF4494004209AC /* SU2_GPC */ = { + 054673F314EF4494004209AC /* SU2_DOT */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -63,7 +63,7 @@ executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; libgmallocEnabled = 0; - name = SU2_GPC; + name = SU2_DOT; savedGlobals = { }; showTypeColumn = 0; @@ -86,7 +86,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 0546740414EF44C8004209AC /* SU2_GPC.cpp */ = { + 0546740414EF44C8004209AC /* SU2_DOT.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1310, 4238}}"; sepNavSelRange = "{193, 0}"; @@ -94,7 +94,7 @@ sepNavWindowFrame = "{{15, 76}, {1348, 952}}"; }; }; - 0546740B14EF44D7004209AC /* SU2_GPC.hpp */ = { + 0546740B14EF44D7004209AC /* SU2_DOT.hpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1310, 828}}"; sepNavSelRange = "{274, 0}"; @@ -293,14 +293,14 @@ }; 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 054673F314EF4494004209AC /* SU2_GPC */; - activeTarget = 8DD76F620486A84900D96B5E /* SU2_GPC */; + activeExecutable = 054673F314EF4494004209AC /* SU2_DOT */; + activeTarget = 8DD76F620486A84900D96B5E /* SU2_DOT */; addToTargets = ( - 8DD76F620486A84900D96B5E /* SU2_GPC */, + 8DD76F620486A84900D96B5E /* SU2_DOT */, ); codeSenseManager = 054673F814EF449F004209AC /* Code sense */; executables = ( - 054673F314EF4494004209AC /* SU2_GPC */, + 054673F314EF4494004209AC /* SU2_DOT */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -345,10 +345,10 @@ userBuildSettings = { }; }; - 8DD76F620486A84900D96B5E /* SU2_GPC */ = { + 8DD76F620486A84900D96B5E /* SU2_DOT */ = { activeExec = 0; executables = ( - 054673F314EF4494004209AC /* SU2_GPC */, + 054673F314EF4494004209AC /* SU2_DOT */, ); }; } diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.pbxproj similarity index 92% rename from SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.pbxproj rename to SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.pbxproj index 180a0056a4a..10b66f7c47e 100644 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.pbxproj @@ -15,7 +15,7 @@ 05E6DB3E17EB61C300FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB3517EB61C300FA1F7E /* matrix_structure.cpp */; }; 05E6DB3F17EB61C300FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB3617EB61C300FA1F7E /* primal_grid_structure.cpp */; }; 05E6DB4017EB61C300FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB3717EB61C300FA1F7E /* vector_structure.cpp */; }; - 05E6DC5717EB649500FA1F7E /* SU2_GDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5617EB649500FA1F7E /* SU2_GDC.cpp */; }; + 05E6DC5717EB649500FA1F7E /* SU2_GEO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5617EB649500FA1F7E /* SU2_GEO.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,7 +32,7 @@ /* Begin PBXFileReference section */ 0533A8C918ADC67F00FF8B64 /* config_template.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_template.cfg; path = ../../config_template.cfg; sourceTree = ""; }; - 0562295417A70687006A083F /* SU2_GDC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_GDC; sourceTree = BUILT_PRODUCTS_DIR; }; + 0562295417A70687006A083F /* SU2_GEO */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_GEO; sourceTree = BUILT_PRODUCTS_DIR; }; 05E6DA7217EB5FAE00FA1F7E /* config_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_structure.inl; path = ../../Common/include/config_structure.inl; sourceTree = ""; }; 05E6DA7317EB5FAE00FA1F7E /* dual_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = dual_grid_structure.inl; path = ../../Common/include/dual_grid_structure.inl; sourceTree = ""; }; 05E6DA7417EB5FAE00FA1F7E /* geometry_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = geometry_structure.inl; path = ../../Common/include/geometry_structure.inl; sourceTree = ""; }; @@ -58,8 +58,8 @@ 05E6DB3517EB61C300FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; 05E6DB3617EB61C300FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; 05E6DB3717EB61C300FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC5517EB649000FA1F7E /* SU2_GDC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_GDC.hpp; path = ../../SU2_GDC/include/SU2_GDC.hpp; sourceTree = ""; }; - 05E6DC5617EB649500FA1F7E /* SU2_GDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_GDC.cpp; path = ../../SU2_GDC/src/SU2_GDC.cpp; sourceTree = ""; }; + 05E6DC5517EB649000FA1F7E /* SU2_GEO.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_GEO.hpp; path = ../../SU2_GEO/include/SU2_GEO.hpp; sourceTree = ""; }; + 05E6DC5617EB649500FA1F7E /* SU2_GEO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_GEO.cpp; path = ../../SU2_GEO/src/SU2_GEO.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -76,7 +76,7 @@ 0546740714EF44CD004209AC /* Include */ = { isa = PBXGroup; children = ( - 05E6DC5517EB649000FA1F7E /* SU2_GDC.hpp */, + 05E6DC5517EB649000FA1F7E /* SU2_GEO.hpp */, 05E6DAF717EB615100FA1F7E /* config_structure.hpp */, 05E6DAF817EB615100FA1F7E /* dual_grid_structure.hpp */, 05E6DAF917EB615100FA1F7E /* geometry_structure.hpp */, @@ -105,7 +105,7 @@ name = InLine; sourceTree = ""; }; - 08FB7794FE84155DC02AAC07 /* SU2_GPC */ = { + 08FB7794FE84155DC02AAC07 /* SU2_DOT */ = { isa = PBXGroup; children = ( 0533A8C918ADC67F00FF8B64 /* config_template.cfg */, @@ -114,13 +114,13 @@ 08FB7795FE84155DC02AAC07 /* Source */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - name = SU2_GPC; + name = SU2_DOT; sourceTree = ""; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 05E6DC5617EB649500FA1F7E /* SU2_GDC.cpp */, + 05E6DC5617EB649500FA1F7E /* SU2_GEO.cpp */, 05E6DB2F17EB61C300FA1F7E /* config_structure.cpp */, 05E6DB3017EB61C300FA1F7E /* dual_grid_structure.cpp */, 05E6DB3117EB61C300FA1F7E /* geometry_structure.cpp */, @@ -136,7 +136,7 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 0562295417A70687006A083F /* SU2_GDC */, + 0562295417A70687006A083F /* SU2_GEO */, ); name = Products; sourceTree = ""; @@ -144,9 +144,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 0562295317A70687006A083F /* SU2_GDC */ = { + 0562295317A70687006A083F /* SU2_GEO */ = { isa = PBXNativeTarget; - buildConfigurationList = 0562295A17A70687006A083F /* Build configuration list for PBXNativeTarget "SU2_GDC" */; + buildConfigurationList = 0562295A17A70687006A083F /* Build configuration list for PBXNativeTarget "SU2_GEO" */; buildPhases = ( 0562295017A70687006A083F /* Sources */, 0562295117A70687006A083F /* Frameworks */, @@ -156,9 +156,9 @@ ); dependencies = ( ); - name = SU2_GDC; - productName = SU2_GDC; - productReference = 0562295417A70687006A083F /* SU2_GDC */; + name = SU2_GEO; + productName = SU2_GEO; + productReference = 0562295417A70687006A083F /* SU2_GEO */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -169,7 +169,7 @@ attributes = { LastUpgradeCheck = 0500; }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GDC" */; + buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GEO" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -179,11 +179,11 @@ French, German, ); - mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_GPC */; + mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_DOT */; projectDirPath = ""; projectRoot = ""; targets = ( - 0562295317A70687006A083F /* SU2_GDC */, + 0562295317A70687006A083F /* SU2_GEO */, ); }; /* End PBXProject section */ @@ -201,7 +201,7 @@ 05E6DB3E17EB61C300FA1F7E /* matrix_structure.cpp in Sources */, 05E6DB3F17EB61C300FA1F7E /* primal_grid_structure.cpp in Sources */, 05E6DB4017EB61C300FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC5717EB649500FA1F7E /* SU2_GDC.cpp in Sources */, + 05E6DC5717EB649500FA1F7E /* SU2_GEO.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -290,7 +290,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0562295A17A70687006A083F /* Build configuration list for PBXNativeTarget "SU2_GDC" */ = { + 0562295A17A70687006A083F /* Build configuration list for PBXNativeTarget "SU2_GEO" */ = { isa = XCConfigurationList; buildConfigurations = ( 0562295B17A70687006A083F /* Debug */, @@ -299,7 +299,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GDC" */ = { + 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_GEO" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, diff --git a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 71% rename from SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 8c004c530b5..463fd908da6 100644 --- a/SU2_IDE/Xcode/SU2_GDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:SU2_GEO.xcodeproj"> diff --git a/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/xcshareddata/SU2_GEO.xccheckout b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/xcshareddata/SU2_GEO.xccheckout new file mode 100644 index 00000000000..5eca11615f3 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace/xcshareddata/SU2_GEO.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 028B7A70-B236-4EBA-9FF9-953D8A326D38 + IDESourceControlProjectName + SU2_GEO + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_GEO.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 7920462095ac0101f61a093405861b57c74d3524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63670 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 diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings b/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index bfffcfe01a4..00000000000 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,10 +0,0 @@ - - - - - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - SnapshotAutomaticallyBeforeSignificantChanges - - - diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme b/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme deleted file mode 100644 index af3aaec54ba..00000000000 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_GPC.xcscheme +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index aeadad80f50..00000000000 --- a/SU2_IDE/Xcode/SU2_GPC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - SU2_GPC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 0000469eb5c1931bbb908b29db89bedb600e29b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31931 zcmc(I2Vj)N^7yy=wIlTsAan>MA-(sW%cUJj?vg9HByhQ0a+l;nNJ0ulir-?xhS;zn zLV_R&f*^`w7e#$mKv5s|-W3rQ+kf^hcS&eQ^!I;{XOjEA-I>|hnc3Ny*}aC&HhXtZ zT-;#>F_>W)j^P*sOf(b2#4>SAJd?mAGD%D_lftAjX-qz&WD1x?X4gjvcgW0o^3n5&qpnN`d+%q`5V%x%nCW)riSxr^Dw+|N9~>|-8g z9%r6lUSwWkUS?ilUS*CjZ!m8&A2XjYpE92@pEF-FKQPCcpP65n-w}@lBqBfLk4B?0 zXe>jow2aqEFE0=qvOsI);8k zKcipK9~fZ{%djW*!rs^ykHO<{Fb=^paVQSM;W!q@;bfeRb8s%s!wRgzv#=WLupS$* z3D;pWuE$o~iRa@k+>Lwi1$YUT@Jf6+z5-u~ug5pw8}Ti89lisv$6N8;cpKi1@4>t9 zllUpTA3u$s!3XfO_yznj{v3aWzs1M!kN9W&EB=E;EXRth2kXts+0kqOJAs|dPGe`V zA#4~M$;Pk=td^}}jqGf84qMM!SR32Kwz6~C4z`o+VSCxd>;>#{_Cod|_F{G=dpUbG zyNbP)y^USV-p;OL?_k%n8`$maJ?sv4Cwniui`~uM$3D(J!9K}8#qMXHW}jgXvWM8i z>}%}n><8?J>__a!>?iD}>}Tw8_DA*v`xD1<9LIA4Cvq}w6gQR&;Kp&|xe44vZW1?{ z3**AM2riOK<=b*%UU9LwOk5#eDqbP35^oT16mJvPikrmE;$7kval81K z__+9l_@wxhxLDvSm54Tv?v1M5dC>l2yr!vT9k4tX5`{ zHOj0qyKKI!OV%x0B3mk3CL^-TWGiJ?%Wjmdk=-P_L$=-!+}_*Pc8D3pcrc!f7vszL z8`Zj)xwggKweWku?p6giwpqHn`xtM=N5T@@$H*B!kX&@DRA`ouQ56&#JG$m}cUl^4 z1s#pO^K9)sW_fUGTw$RyExsT+IVnXEos^cA9-Wq`D2mRHk5?8XB^DGY^5a~X1DNSd z)K+F3GoG2iOk^f8lbI>ZRAw3zDDjdYiIPkjC3#4ml9%Ky`D|roFhNW(6T-}7LYXio z96ryGd?mSbJwaxI8VG78=rV#^!NuKNN0CkGa&LUuTx2nC|-fnl(3Iq-Ntn6s-?r5{g zT%1m4vYDuUCWFajvLrvrUmD%d)(HoeE}H8?$`o$WXclQN)xoQ5%_J zri4*3v!t=ocxj?Ec_UNClrw5ZBTbcNN)b|w6mp2sf?VquJ!4?1sAM+)<7dO~E?XN+ z)B>BtNaLgcv%Ij$-e${)jg2*Q!&JpKbz0gijrNZ2Se+puwx_GNeQqp_cV0((ti8Rl zt=DRcZR}`ovNxN%;bmh_ZKbO(u1feVJO{{j2^Sa+G=hG;RMoqI_ARDc1xorE-pSH zw#_ontX3!$^g~QzQ}a+%%??zP&S&r)oen7<9DGY>=TOjX4$xEn;V2pxw}Ix_x*Vf$ zeQ=J#X|Ot&ZYs>3%zUOxnkEHG)BBkork7bD&5(kmU@FWZ6sE`?Mr0d#T8W-m!dNd+3xQ+&YAZ~gs^fMcQkXR{B3UN@70u-bV z^q!q@dxNX@7G^u`y_LC}*(N1ONm5Eba}TqF*(s$-H%s>pSJyob5lS@6GtZ?6PSpe@ zHJ2-tR9Wfom_^ipb%FsJDw7X604AH|`6B}e_Al09mQDv7I~49?4!EgidBKR_4%kKW zSwOpZ^(1qEnz*N!{mj$MGg7*gA!SNg8<}UB=a}c2|47-AN}46zL`6Kz0m@}?oyIt( z+hM26V9|-`h89*sdDI!2R&?25S?lfATe_NU18a?vuJ>nd?ouF^LX~wiI+i?W z9(@Mr&T%H@_uAX6I$IAckj>pr5?v!b$Q)*(HZX^zoDIxtQZ5~lUqO{#N2#s?s#QI< zdEEyc4$7O%(LUxa=D$*&R3w$S0KCJz&-nK-?=tU63Ms#j`GEOQQc49wu#LONykH%B3=C&7dJ~gE?ty>FDk`$8vU7or$FuYqd4; zt9=7(Kr-Y7dW%LO59BFnqzb9BA9*7m7@(R8UwGD_7_jZ`bm-h_fsFnEXX4~0o{ zq-&+?9sh2ik`<)vXlt`{g7+2Zn2JD9$4*;U&*DHOIDgF@U3MD?@&uQV4{zjn7kt*S z71%-3EQ`y*_5h+G&0ILDEN#7D@rSgUGNjdT?QlXF%19R!H8>SRfH;{H&m7$$PechQ z5hbByl!8)G8cIhQC=+F&Y?Om?Q65sDe56DLs1OyQVpM`uXcj6(WvCpfkp@+uN~A?P zq(=r+g^Z{g)u3858_hu`RENx{9$8QWYD8AaB$=gp$s#pKjgnQeNlj9-)FRoXR%x!( zCe4%Dr4Ff6nlE)p-BOR#D=m-~N{gh$(go5IX{oeKS}t8ENfMD(NEb;LOP5HON|#A1 zrOTx&q${PXq^qS>(lyd*spKH2Kr?DV_8M^5z|{cLA=Sa;pfY>=T==kbsZpU-tJKBj zvVx*AMX}DI#Aq&R17F&$jygxjet0~OsRNhG`Pl`#lS0e`U%Jf}SXNe59@q$8Ex3YR zfk`n5fzg3w;2rc@nr%y$7AuwJLbW2ltk9fqP?hObYIBi6t<s3nE0GCoo#eWl$UR$WpyNNO@bml^>R-<*3cOeC;|4X3VFdd4vw!pT5 zDH%F?Wl5p3)T}eA^vV*mPOs1xmKUn^ZVW3Z2ID`%pvc!4^yY%X3T>ehz!#i8`Ik^6 zs`EjjEK`6GJEpO)yh2}N&es&wxLCfDf;F5ESSqm&phX&k)~qa1XcbC*A^ZgrtA}ZI zv*${RLivwS=t>j?8l#KmRTQB1d;kt%g^Nr|Z&jgI2a4u`e=UXo&m<-#$*k9y6BEo- zX->y*1I3{Jha;e>eFoS!QP}1G5VlHvCbDm(pwCOthcI4MUQwn}0$X&dV)Ys5znvnP zb3XLDB~qnU=~ap{RV|34TB8SLDk}rA2LUZD1m$wg^ZN6i1ve(A-f9c=1~8KPnu;BtjiNX&eLiI#T%%DJ8p~8__gw6t@bk}yTLVj-SvlYUIM?A_{}xLs zG@xf7qf`?L3)F==H%stU8PoPfPTG-x3dx=fVI1%s6t7@!48U~xO$ z#dw0^tU6zujzyG?%IRh(!N=0k)uTcS(oy7^y8RT#KQkx>@Mc{KUSL)j^cuIk9iY(5 z{?P~w>Qc4Fs0OkX#pMb&* z>J5Me%~O=af}?eTKJ>3qT%{;8xV8HAe~rae3ayInL0kmCNgW?Y#!jS_X!ewQ3bzC*D zT3@K99;}<*&nU=|xvVU=5968}L%9KB0{|O@zsOl(|R)jznQuA=NY2 zB>nWySvO=)>Ygvh_Sd->x-gxjm`0``!v;1)mL1?>|68bn{g~NUs3>&-|D6IK+1fV@ zxSMNWe^g4?aSX6$m?UF{LLb>??99*&YNvYuYm^Ja0Ogpau>YYRDzr-2yQm6^3(ZP} zP7ga8H9T?z<}lA3-GBw@I(Ik=dr*x3#%^2A$dNN{{S)@-qv2-9CoIQ)X8Ay5aUk1p zYOuZ^`{U6J&~ff&kg0-@`Kg@;!mxNO4q&3zucv7nM>-Bqz*8Y-fhXcgcruG9QI790#_npfM#b*c_0(<4|5!@cU}ET2A@^cj{t8O(tMI_3jh z3>l8iG{bTAqJaztl!o9^2*TqsY0HrG1lHgRT!}bon{>Cdm8Kv5g~VErV(<3-^@kr> z=pwKR*Dz6i*oa0++a*mOuEn#Zd!!wZtsIygSF+%*=f;8?hRdrBw^Dg+!p*n^+ofI7 zZs|U0&qh2Kx8ZrXUAkX-OnO}Ul1}13ls}hf|BrHPxEC*^V!1$iU;|zx?LC)RE~R3* z3@?`+lpYxrOM)+^a1>Hvnil(FdC9vS>s_L` z0pICJi{XB}5z=B$OV9M zCFVw&55v#VW%qgM;NY_R5?yxBv4I8^?d;4^g3=Wrm zEK<-a=pHCzfwCjWf`G44;_{HO!xtZSY7<>SsaB)WyPO_}8$AIP*gD%f7SnRQrAt*b zCjhx42`3pB;_CodW(8z{b%9*x}AjL=~3CxfWVEN8uJ}V3z`3 zQIX2MZN&~}bo|hE1Aw4dsob@>#SX7B6zOcV>^rc+($hjmTV_<$=)jMo!!|>7K9b??LeBFw^0 zrGWp{NC-Qfg8YX&uyaO2*kFp`|3@T*4gHre{beMCji8vO(rVRcC}Os^+pJDYR<0>1 zEHmqAB)Qn7bJ4Wz_~C6~ZOd1w3!v42JHy7Zal_nWHj&L|qV8dn*km?^O=Z)VVm5=# zWV6_8Hiyk+^B9%%we+p@z4U|hBh=vjB>f`&D*Z0~Nf084l_uW9D%k?IkS$`1*%DU8 z&SFd1GPaymvl_O7Af6y^g2oawnV{(eg%K1*P$EH@1mzN>B&d`i9YM2)l?Ac}N44EI zgWlaaN}Nuq*lq5zTcK3e(g}6mv_|`E)vIi+1IKqziSgGJeW&2C_FCG^4n${#ZgxOF z2A1k?Lw5k4*RcQ!&!Ot~tQf2g49Cs#S$`WtC#{zKs}a~8@K3~Cgy z_Fsc_)!ey=cGat%Lg_LG$UpwQ`GeB*Ar-6a3JRYfX0TvzsUBDA`m1JBqM0lM)pQ_ z4KstinII1WRgb;|dC~pSS?j+?SV3+ov0H86*r>X@dugTN$jZ|pD#BfxbENL%94IYM zOoHm{1Ad*%#TDU_xFYXevR|=!67HA;Sg4QHqOx;oIgcNlbGdDM+PU zN=iwAQvLWrE*)WyQZBv0zRAAD{+FN`1O*WkOi;*1_HFhZCzoat6#BpB(gR-Jcw&)ILzI)ZQ6?|@Oq2nr`Cf-)*n3Zdbcf(`L8m8K<$$q7kRDU#9>K`9cG z;rIi5N_2z%nf;xD{)Iis{>uJFP&7d?1jP~*w~_sW{nN>uc!CoC=gb+WOS7yAbTTI~ zDa|zk&V%!X5pbTI7w64^PA3tROi&6zsT(;t=f}+8MiZ1qP&#E!#{W_a9*E0ho|`-e z)H*Ib9uzq~Jt2u&s`&KyL^?(8Ax+_+i2KZX%>{A6FeDJyEP}G>kaFmJgMwL}D|ISZ zd}4h3vg#!XX^s;&1Ga*T;^NOX(Od$T2rz+bc?2ma%zTFojnh?}^lk>b8c)qmd|FyO zoPSA(PXx2-)?hA^%cJbi;Tz0C@C%lW(Y=?0*9vD=A7%{7E?h! z)1t>+z%79hEhA_SK_)t)x&h@-uYTV$XGv;mDu7B%PE7<(rKiP%AP>U5h`R*x0Nlj{ z)oj6c2RqF2vF>L>S!D7h{#9NQu|&wftTS9&{r)=OEIS;xscz)-39@6 z?q=>5?pA_Y2(lB@+Rv@!Zs*n!G?$=D2)dM#5eF!TpQeRv89jLm+dN(GJbM1mIXs=M znQooH@fv?x7medgBfJVY?Uml%(`Ivod%2Cw(T&`l+$L@_cNalz1a%X%kf5dRR0(%C zw}Vo>joZ%ML(n{e+6n6D=XP@Ua=QrXBxpWCU6ksXr{Nh!B%Cya<0w6gAw_xahWQX} z)!91XJR=-pHp|1$-P(!6aTF!UnV4ai%0PqTG>nV!`?$x>G=#^wC%7jG>LI9?pamdx zd2&a-hS6pOo+>!ca^Uow&V?7bm$;V+T13!df-V3Mx!*ZKG%|r9m}rthqRdx5anj`AkjVI?)PbY!qdYvlynWo~Kn9Ms z!>LO}4;&O}0D0_&Bko=jTchi3Y_!>|HtQije~-}t6V7ljzHiJ}iIe!gapU2T`Y6e> zO06q`^SICwju~}y9iB3Enn&RD8A0$|XTQJ(SeuI4EY02UnW|h+-c0A<{k-M$j60m& zjw$PHv|BC3T^2a_YEVVzceGg#&I}C;Khufg0d##~5rapGqoO@xV&i}UBTW&&xEz$| z=-K@II7ZG&9sn*O(M4ikLIiwHP8oLWv@e-HOiMS*{fF?y>Xe+mjEFNncbvH?wJnBo z?E{yzyqcY(@9OC2kq{$e{NPxB5M0la0N1e;!tre_9FuNfI^g7PHyqf#khzpu1sATY zW!5q4;XLV`aOKJtW+$^3u3C8(E?Id4j`)29SFC&nC*wHei^jvTuNf#3&O2qmNv2tF zhDi-4muAB`rAE|=y3rzZHCm1CL=T{c&|^*>W90k|XWfVW4?RK95=Y?#_XhW-$$f69 z0EDj}9=*lX0iWq7mv$WGK7@1|DEK?vyWBn8``iZ(H3y5l95kJv3ki}oaUY>D?i21) z6h1{U+&jesU-6#CbVbUlmP{<P6PTYWai)+36^HHpt6AblR3JT&E*k~d6wsRo)>tLm+_+rjUrx7(3J$i z+OvuvSaz->2>7^$pqr_=)iMJ|`*|N{kl+flTsIJOa4#u;9oZN`v|td^XeXwt{>5+) zuB0%ftwRSi*@@#o2s*x)b)b|91gMex?(}^>7yD@6U%TI5yI7Eg$K`cB5Hd zdH&e`I&jO!Iq}>y7<>L3Qsx@fU&PP&WG9ka250AQAaRKDS)#0th!>y6E10Oe_;fyl z&*ZcCY(9t2br~2=atM1zL4>O#w9##arz0`NS)3* zCDze+CqYoqRR>1Md22~g7c6X0iUbcdU2u1U&Fa1zMsI0Q!s^%sCvf4S3Mle$cT%+% z!8J79ja@cdyYt{{4t?jkRAyL5vob}Qo}z$@WE2U7Nzo83N{&`2i{M9EVt!nHYKl@> zkOD{7hXQbtHi+ENZlB+48!U@5%cnte=S41O!8(LmeMd)IgQZK=J#a^a)0uSQ08;aZ zzghxOI`GHgCWxrOCGm+VbYqzsw``fi`tb%R=HOwMyUtzB!PoGOOw<;>mY>bf;Z1xU zZ|3WH3*SJ{CW1B-1a9XRg0>O_k-TjLZ71lSExeU4VS@Q)zJ<5Le9h&-G2KCD27;RR z610!tK$tWfNpKY0(EwuwI?F5#HaICOhflhej)iKtKcv~|K?W$G2m)@kaNRu9U1nL_ z(F-@!L=R=^uvszm*x|VTVg+2Y<1RgO!gj-@?@pPQVIbi89D8&786Z&VobcfQHkCB! zRs?5sX+Z$py*O+0Xvf(@g2dZFj-Un#?iskqSxx66>N@_$)8O6Y zfcFqBgqrVMfL*O`kYCH+&adM^Js&3M5rQ5i=&_Cb2ELE)=Qk4cI6-d^%oC_K z4Kd3D9fgXnOMKju5Ccw}^S+w1H_5m3G`1AM%`33Ka}`dy0k}$rPKWFaX}d_io8Qeu zZRWS}+xdI=9sExIULJNo;A_DK;wggm6ZAAe&k%HAGk+fh;AZd-z<&?&4-xb%MB%`| zJV$@LO3>?0>oTBga3K=NA$5!l?cJ6IHmj?m69fXbl2CF|*lvM)Re<)%&`75&r?)!w zcAx&5URzbTsFV8HR>u_+dayoD!{xkn>FkhwDdd5BWSqUIwQ;j(7}R`QQ%9H0jo#UO z%o68)EnpE6k|FGrmYlH66&T~6<_|Fb8+hQ&^BeeQ3HlGcWQ(G7?Af{%-4uq4%`fmT zQQ>}(pcgjqFB9}46h;mxfvd?O{tXZw<^%pU{&oI{q$KDif}rUu@XYxS%I}>2LaJ2l zaJb%9<-Fy|sB+$QB@A z3FE+~mI#xC$-)$296>PTpPa(^J3+rw+X}1S9|SW5v-AO|9Tfz({+tMZV^tRMEcDq9tROa1noOM%<1$iM|NAnM?T#VIB|DZHMfJ{(@UzHdldJJ!R`Ypr0rO!0xeub z^I_DioV{h4>#iBcRc)}@gsj^cJGgK8DDLX$?F6_~+ud;KfawnFkPyvy3Nb>g5GTaD zLjuEM0R(+Q&LP$U$?SV|bZFiR*E%HZ}sSS59EOKLYVf{XPaymCmW6Z8PyEYu71ayLiB!x7|wj*jiA&?s14jO!B`nYzP5lh7=*KqtG< zD$EtyfSu=#%y`KOI!@4!V1iGH%{Vc12%Q5{(kFBboWKye1nSTU``ICxzqlk5?&dHWp`=G+)VTz2xo{B`ybKV%bOF*sV3_xCQ!9E20LQ-CMNZ2PpDqDC|cnp3%L49>O z!F~i!rhiT$cq;upjjk{>a9!Bd)zRhlDF!?q>KPC7l4x+=Z3v+?wXgJ<+dpyCAkc1( zMI?W*GwMX+_b%_oX{*7X8tCciHzPwnD;7!W&zJ zmxWh^SA~PZA>pv_n((@CgkXPyM-x1T;IRY;5Im0H@dQsGcp|~{?!p0Y=da^Dt{wQ9 z;v-NLG-5b(lYQDQ9*Rn!LgjD4ID34<0jy-iz+3}6O9%tX*hUP>9Sb`{k(q<4vJr!F zQFV@*wZF^tc@_xKFB)Dx_IF0-BI!(wf)XjHXB+Y8&K_xT+M5rBkHG8=T=EF^tzY<1 z_}FprCwy>h{e@43H`ap)J3oBE99=&U5f#23`rMLHLn+%#O{haDw3JQiv14 zFU-+?;iT}Z@EgH12o51Q%)NUR{uJ@>-KNNj9Kk^Z2Rob%&{VfqM)%P{d7XKV9q0gB zag^wF3IJ~rY}ZVJLt*<1-3RyJL3!5}4C^~u3^=9lI1w~BoZtu-a`*0j7;>{b;T&4+ znkqUI1AoU1mUf9##V|0$;xsW(oG#7~gT!DlM4Tyx5*$r%48gGk#}OP)a00=J1Sb)k zyhRKbBWN6j2^M3-STPRbT{wl{S&l#oxcj(`VE73kXb5@L!c}h&6mf3osN?Kpfy0po z_q5$=>9SJJP}}N!RXe1Gd`uO+64-TjuCBLXp5xlM(a>YyQewv$6Uq=+eg+;5ULy=U z3OM@#sZ7`1i++yg&9<(g;TMYA^_)UFEM|*2VlLw;<}rFPUsQsXrWqP%e1{H2?Vw^@ zv#s6UJ8(}U4V%HL?tC-eQ6Sp2*g2FTuLv#zUje5Qta@E66pH{yu~;Ii08gG+hP}jc z>{$)RR@$sxw)Uz{3;gVvO`Qh#?Ob;PtpisYI`c<#7e9QIvmqVo8ZpIHL@-QH+H0al ztN?VCqE^(2deI3T*tBAO;w-@$hT=M$Vk za3R6z()DJ!^J-AKU2(6GG>TBrK|#j2gNW{Mi$hDrTIRQYake-|G!dLha1OzF(v1hj zdLZ8-Hq;J9mql>)(A}`Zu820V$r;%gWRf#2=ODboV(;n`o2f%XcY zf>5Nw4AOg_#mmH%&aJL{_J_qchbvj1csV7DX75JQ+=<~z5fV>yFaB3u`oya#^pP}m znfPnOYhh&(R});iLA;LOGU{xGIQ4uW{(Cm_;{vfpyqSWyiQw`L;w=QLr4W5NsDtbM z?cxT;zh7J@-XX%ury;n4;L3in5A5wmg0B^8US9{%>Go#FpYH3C9oKP= z9o}{zqySYY!=4upBt@Jvx0TM^-3060L3i;U@qP$biaW%e;=ST7akqG%xQAd6cLTvy z1RDviCb)*++Rfqv;$HDV@gY#yhs8$-o=xx^g6j!xCKzWn3u6Kotz>Lz>WYB=jcD;iOVgX8LZv)&I z8Pgcu+1A_b{NX$-?wXrt#TQ|#c*dGA@g?zPW`_7G!C0C$F3R}h>9f>k z4YkTg#5bH)ncyaZEiNPKoQ$`rNqk3qSA36Pusn?fTZfoL2T!w4u~*KIpHo9+`)flr znOfv9xcNU2E;w$C3T%X%zXK!S?*+3>;eX@md3O?6obSldVdo7G;!jkXekORX1R2P& zgZmq}{Tp&UsmZXxaWVNf8Aqk;ckvJLPZ=XaGAv^Wo=0#y!5sv55^8!ZOz-=5Rxu5_ z5N@xa)~UW=d5IOgK6r8K| zWEtE7u|Wo#)`jlY6Ws*T`$iK>|k>F9WY`DZ#|;0?U$RY2by*Qe@zvEF*Y%pDbMl%lU-_OCw0&n1<0Gl(%I4 zP#0IGkQJN)yif+-$qE9;;tW#`l@N}LGbRnA#IbSLS{6D}1Mr0w!`}{ALkFM1iyZdSF%cbIJ&<;5 z?6P-4=@{(i1BNwmK&KYWp{cUj%x~-67E@LytEcm2Ciuz?GSKO(98z)Sw3^IDXQfF7 zCh}^6;c8#kq_@iE4c{Bc+GU^!s|dbEDs;-bw2K^2Rl4u7uF7QK*IQ-!Tgo2&Y~k+ysHGM}^nmn{pZ*irIP{-ef>3K-QsYRRZ&qb?jpMm;y`^-*t( zdTZ2Ck0cL;M~TNQk1`Lnhrz?>QR6Y&!{l*^$2N}x9tS<%^Z4B3n5WFs*K@LGxM!Sa zf@hLvif6WGuBXCN=~?Jm=2`7&@oe|(^<3z=*mH^J3eSr@FZEpMd4=b7o@+ht^xWn7 zpyxi%M?4?%e8%%x&*wc~@O;VhEzb`wItXy~}rp@4ddeefRi2?E9$i-Uh~!+wwYJ?{6U-+sSm{GRoD-tPs!m;7GwJLq@V?{&X7{ND0A>i3S{dww7IedPCv z-)DYb_b<@C!|lvpHMJi?SwlgY@YDj zM1G<;v23DYqH*GmiF+qLG)b7`JIQa-{7Dx~S~}_TNyjD~pKO}kG`VH+6O*5x{KAxJ zQ^KZ1Oj$f-#gvPu9GY@;$~#jdrY25Jo_fjDRZ~|_Jv#N{sh>_unU*_EG3}aZH&45D z+9%V#o%VfTZeU5^tiZK_cLr__{5J6Cz?0J}r`JxOGkxFm{nMYB5i%oYM%;|cW~`oZ z-Ha16{tQAv^+EQaxj~NvJrne7@TB12;F-Y-gQegV!EXkC5d3lQr@@~G9}7Mnk`a;> zk`q!KQWjze=?z&LvNmK_$YUXohddGTRLCnKZ-)FgDWNk$gF~TA zH8dqu6*@0;LFh%HD?_gcy(;wD(Cb5Q4819Iedw0ZZK3ys?hJh*^r_INLl1;L7v>W- zE-W}KJS;LSIxHb9DJ&%{Ei5mrB&;E;e-HmNf{PF$WDy<_qa$J?(jqb=vLkXMDk8KI`iQEC>WD27 zyCNQocqZc6i030-h&UASTEvlvHzWQV@j;{*859{AnG~5CnI4%LSrTc8G)C4$&WCg`Xic&#?f4~5G{-Li1v#1iIzwEM~{gPh#nt3F?w?J)abzI8PUPf(b2Kd z#nBbf+UU0E-spwV*GI37UKjmz^h?pNM1LK9BKqf;(J_-_rpA=SRL1CHu8&z8vo7Xn z%*QdG#wNyQ#pcAWiM=CsL+q!q-^Ct_Q^u9WspD>s+Z1el2cO*WX_-Nwe ziBBf(Pkbiv*~I4)Ur2l@@s-4biLWKTk@!~PPl+cJe@|kP*d!roRFYScZ<2q~*rf4E zlai(;O-~9+ic5k+TS+NNmnGehv?l51q+63dPCAx!Jn2Nz&&kEf`sAwQ>g3ww&B^yA z-=DlU`Jogh#XH3}#V=)aiYcWvr7fjBr8DKelqXW2N_jfvK&qHJCN&^+eCov1=G30l z1*wZtm!v+G`bz4-)WfMq(nhBRrp-tTP76)zNh4`jq+Ol1I_>(jHEDOG^`+gJwmEHU z+P1UWm%VI zU7mGS)~c-4S=VK4&pMp-LAFQs=gXHU-FoP9Zu<{Zd*KIg@pmvav09M1VRHy}4S zw=CC?Tc0~OcTq0My*T%>+$(ag&RvsxOYYj-b-5dI`*R=7{W$lByh(Y%dGUFfc_n$3 zdHOtKUTvN!uPM)-*Ou3wH$SgCZ&lu&yr=TM%sZ~Y3U9?kMUY~qB3u!rh*hL1G8H+B zJcUwGs8B0rD{P7`MXzF!Vu@n8LQDGz{Qda{@}J9pJ^$_e_wql?|0MtG z{O|IA$Ul+)vvRspqgk19V@ zexm$b`IYhq^r1>*{)6|E?`q-a&q+M@oVtwj$M?Jqh|^nB5aMXwYc zDtf)>!=g`$J}dgN=$oSNijEZ>FP>1GQ`}N~UGZ(j8;iFU? zF1f$tgo;)1Dp55`6`&fgny8whvZ=aMJ*ow&#j0mjuc?lx-c%i(l`=~?t8iBFtXZ?x z&ANNm_E|e-?J8wU<)!|mV@k)BHkEdlUR-)v=@q3{m#!|ozI09LEv0Kqx0miL-Ceq; zbZ_ZHrH_<8Uiwt&)1`+?e=ZwSW+=P3Y*X2jWp9`LT#m}QaN0h; zx<=ikwyWFJ9qKN1k9wv0TJ;+BE$X%Eb?Up-JJq|@_pA4*A5}l0eoFnS`Xlwn>TlG) zY8VZx5j36}AB~@8v}UpXVg>Qv_#h8kKiU}2yDyCLUuL!D0s4!M6sJOb~-ioIxj#ZAT45*w? zIk|FL<&4VU%9KiFWl^Q7vaC{5Sy@?A*;Lt4Ilr=}a$)5Kl^0cBQh8bB<&{@fUR`-Z zMt@}u0@Ez)vYQR|`g z()ws8YD2XV+GuT@Hc^|b&DScm1==F5PTQvK&~|BiwTrY%w9BzxIIkdF>0@Uv;6nQeCU=3SGbMIo$_(FMYP&s$ZgC zslQggPQO9FQNLNgQ@>09U;StL@Ab#^Kj}~Ee>Vt*Q3fxAufg9i#t>?VHKZ5{4OIq< zVV>ba12J4=xYV%HaIN8P!!E-MhIb9etC%Y9s!3H-tEN{4Rn4pluZpY6s4A|~RB7Q` znv7NTRV`KXs+Lz>Qnjk;#;SEy8>%)|ZLWH->dC6-s$Qx(QuRaCNn?O9(wJtY(bG)#24q)v?v_)ynFM>dIna7}1UcuiDIOpU6hx~8p0 zs=20SbIrb*BQ;;uvbA2d(`skbhSY}DM%KpE#@8m*rq*WEX4hU)``qk+*_PScX8$@T zcg_`aUYYaeoKNO_J?Doxzs>pG#F$2zJWO7uv8Dji1k(&tkZGnV(Uf9JH)WY}O$yU2 zQ>967GMZ{lb4+$qyJ^0u$F$hA)O4YVm~JrLZrWL%7{>gLpS)OFSM)-9@AQn$R0)LmS6S=|+Nx7V$&>#y5X zcURrky6ts4>vq@OU$?jJsk)>&)BC2h7i#UogLHK4|{Z zeBAtNy;vVnpHiPzpIM(%uc)u8x7RPKzp{RF{nq;J^*if#*YBzSwEnyLpXyK6|88L{ z*y3pkuuQN_wuD*YEfp36L{XPnB+EsXD=gPr)>v+_Y_Qy8xz}=^<$lXC%dZW74FL^N z4ap7l4Yr2W4O<$vHQdv1Z^Q0}hZ`Pic(P%C!;1|+HT>2%6LR*3#@a@y@#@Cajn_A> zX}qQJw#KI#Uuitl_jLXy z>r(4->y_49t+!j(Tl=k>tXr(xtUIiaTA#4)w;r%QZ++4FiuI87HR}h~Z)~G%Q*7xr zBYb`5g|@3~H`;Et-DX>7+hE&j+iu%w+hyBhd%*U%?M2%W+gG-4ZO3ds+J3g3Y+{={ zn!KCjO{1H}Hcf4s-W1#v-4xf9*p$_j+mzoltI60@+hl4oH!W}4+;m^l{Y`tD_BHKq zI?(id(+f=>HGSXAG_%b@^QdO8X5VK2=CRGe&7sW^&C$(q%?ZuP&1uaU%>~Ws=Bnn7 z<_nrHYQC-cuI9U&?`gibd3W=k=I5GUZ+^4+X!EB$g!nAm|$XiCY1hkBAnb;E3 zlG&2eqG%~-DQ;1#o*4t$SM^YCX{U zLhH+|2V0M{zSa76>$|O=w;pT#b1pYmoa-^ycdq~3v2(}G4WFAZw_vVnuEr5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_MAC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 9b3a59c4cda..00000000000 --- a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - SU2_MAC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index c7c3f6535a2..00000000000 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_MDC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index fdc7014723863db583141cc63c69aeff7237d182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63047 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 - - - - BuildLocationStyle - UseAppPreferences - CustomBuildLocationType - RelativeToDerivedData - DerivedDataCustomLocation - DerivedData - DerivedDataLocationStyle - WorkspaceRelativePath - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - IssueFilterStyle - ShowActiveSchemeOnly - LiveSourceIssuesEnabled - - SnapshotAutomaticallyBeforeSignificantChanges - - SnapshotLocationStyle - Default - - diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_MDC.xcscheme b/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_MDC.xcscheme deleted file mode 100644 index 867439fd559..00000000000 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/SU2_MDC.xcscheme +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 5949abed0a9..00000000000 --- a/SU2_IDE/Xcode/SU2_MDC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - SU2_MDC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.mode1v3 similarity index 99% rename from SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.mode1v3 rename to SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.mode1v3 index 0d0a2e5c018..4fdca3030de 100644 --- a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.mode1v3 +++ b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.mode1v3 @@ -314,7 +314,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SU2_MAC.hpp + SU2_MSH.hpp PBXSplitModuleInNavigatorKey Split0 @@ -322,7 +322,7 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SU2_MAC.hpp + SU2_MSH.hpp _historyCapacity 0 bookmark @@ -543,7 +543,7 @@ WindowOrderList 05AB07A813764A37008163E7 - /Users/fpalacios/SU2/trunk/SU2_MAC/SU2_MAC.xcodeproj + /Users/fpalacios/SU2/trunk/SU2_MSH/SU2_MSH.xcodeproj WindowString 22 178 907 880 0 0 1920 1058 diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.pbxuser similarity index 94% rename from SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.pbxuser rename to SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.pbxuser index 70378975ec3..688de4005a8 100644 --- a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/fpalacios.pbxuser +++ b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/fpalacios.pbxuser @@ -32,8 +32,8 @@ }; 0525612E16D1EB36003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05AB07B313764A7C008163E7 /* SU2_MAC.cpp */; - name = "SU2_MAC.cpp: 5"; + fRef = 05AB07B313764A7C008163E7 /* SU2_MSH.cpp */; + name = "SU2_MSH.cpp: 5"; rLen = 0; rLoc = 189; rType = 0; @@ -42,8 +42,8 @@ }; 0525612F16D1EB36003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05AB07B513764A83008163E7 /* SU2_MAC.hpp */; - name = "SU2_MAC.hpp: 1"; + fRef = 05AB07B513764A83008163E7 /* SU2_MSH.hpp */; + name = "SU2_MSH.hpp: 1"; rLen = 0; rLoc = 0; rType = 0; @@ -52,8 +52,8 @@ }; 0525613016D1EB36003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05AB07B513764A83008163E7 /* SU2_MAC.hpp */; - name = "SU2_MAC.hpp: 6"; + fRef = 05AB07B513764A83008163E7 /* SU2_MSH.hpp */; + name = "SU2_MSH.hpp: 6"; rLen = 0; rLoc = 274; rType = 0; @@ -195,7 +195,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 05AB07A413764A35008163E7 /* SU2_MAC */ = { + 05AB07A413764A35008163E7 /* SU2_MSH */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -218,7 +218,7 @@ executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; libgmallocEnabled = 0; - name = SU2_MAC; + name = SU2_MSH; savedGlobals = { }; showTypeColumn = 0; @@ -227,7 +227,7 @@ variableFormatDictionary = { }; }; - 05AB07B313764A7C008163E7 /* SU2_MAC.cpp */ = { + 05AB07B313764A7C008163E7 /* SU2_MSH.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {824, 3042}}"; sepNavSelRange = "{189, 0}"; @@ -235,7 +235,7 @@ sepNavWindowFrame = "{{38, 103}, {1074, 693}}"; }; }; - 05AB07B513764A83008163E7 /* SU2_MAC.hpp */ = { + 05AB07B513764A83008163E7 /* SU2_MSH.hpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {621, 802}}"; sepNavSelRange = "{274, 0}"; @@ -364,16 +364,16 @@ }; 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 05AB07A413764A35008163E7 /* SU2_MAC */; - activeTarget = 8DD76F620486A84900D96B5E /* SU2_MAC */; + activeExecutable = 05AB07A413764A35008163E7 /* SU2_MSH */; + activeTarget = 8DD76F620486A84900D96B5E /* SU2_MSH */; addToTargets = ( - 8DD76F620486A84900D96B5E /* SU2_MAC */, + 8DD76F620486A84900D96B5E /* SU2_MSH */, ); breakpoints = ( ); codeSenseManager = 05AB07A213764A2D008163E7 /* Code sense */; executables = ( - 05AB07A413764A35008163E7 /* SU2_MAC */, + 05AB07A413764A35008163E7 /* SU2_MSH */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -424,10 +424,10 @@ userBuildSettings = { }; }; - 8DD76F620486A84900D96B5E /* SU2_MAC */ = { + 8DD76F620486A84900D96B5E /* SU2_MSH */ = { activeExec = 0; executables = ( - 05AB07A413764A35008163E7 /* SU2_MAC */, + 05AB07A413764A35008163E7 /* SU2_MSH */, ); }; } diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.pbxproj similarity index 92% rename from SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.pbxproj rename to SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.pbxproj index dcacd327362..930456dbb77 100644 --- a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ 05E6DB5017EB61CC00FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB4717EB61CC00FA1F7E /* matrix_structure.cpp */; }; 05E6DB5117EB61CC00FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB4817EB61CC00FA1F7E /* primal_grid_structure.cpp */; }; 05E6DB5217EB61CC00FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB4917EB61CC00FA1F7E /* vector_structure.cpp */; }; - 05E6DC5117EB637300FA1F7E /* SU2_MAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5017EB637300FA1F7E /* SU2_MAC.cpp */; }; + 05E6DC5117EB637300FA1F7E /* SU2_MSH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5017EB637300FA1F7E /* SU2_MSH.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,7 +32,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 05AB07A313764A35008163E7 /* SU2_MAC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_MAC; sourceTree = BUILT_PRODUCTS_DIR; }; + 05AB07A313764A35008163E7 /* SU2_MSH */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_MSH; sourceTree = BUILT_PRODUCTS_DIR; }; 05E6DA7B17EB5FC300FA1F7E /* config_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_structure.inl; path = ../../Common/include/config_structure.inl; sourceTree = ""; }; 05E6DA7C17EB5FC300FA1F7E /* dual_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = dual_grid_structure.inl; path = ../../Common/include/dual_grid_structure.inl; sourceTree = ""; }; 05E6DA7D17EB5FC300FA1F7E /* geometry_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = geometry_structure.inl; path = ../../Common/include/geometry_structure.inl; sourceTree = ""; }; @@ -61,8 +61,8 @@ 05E6DB4717EB61CC00FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; 05E6DB4817EB61CC00FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; 05E6DB4917EB61CC00FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC4F17EB636E00FA1F7E /* SU2_MAC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_MAC.hpp; path = ../../SU2_MAC/include/SU2_MAC.hpp; sourceTree = ""; }; - 05E6DC5017EB637300FA1F7E /* SU2_MAC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_MAC.cpp; path = ../../SU2_MAC/src/SU2_MAC.cpp; sourceTree = ""; }; + 05E6DC4F17EB636E00FA1F7E /* SU2_MSH.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_MSH.hpp; path = ../../SU2_MSH/include/SU2_MSH.hpp; sourceTree = ""; }; + 05E6DC5017EB637300FA1F7E /* SU2_MSH.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_MSH.cpp; path = ../../SU2_MSH/src/SU2_MSH.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,7 +79,7 @@ 05AB07B713764A8B008163E7 /* Include */ = { isa = PBXGroup; children = ( - 05E6DC4F17EB636E00FA1F7E /* SU2_MAC.hpp */, + 05E6DC4F17EB636E00FA1F7E /* SU2_MSH.hpp */, 05E6DAED17EB609A00FA1F7E /* config_structure.hpp */, 05E6DAEE17EB609A00FA1F7E /* dual_grid_structure.hpp */, 05E6DAEF17EB609A00FA1F7E /* geometry_structure.hpp */, @@ -110,7 +110,7 @@ name = InLine; sourceTree = ""; }; - 08FB7794FE84155DC02AAC07 /* SU2_MAC */ = { + 08FB7794FE84155DC02AAC07 /* SU2_MSH */ = { isa = PBXGroup; children = ( 05AB07B813764A93008163E7 /* InLine */, @@ -118,13 +118,13 @@ 08FB7795FE84155DC02AAC07 /* Source */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - name = SU2_MAC; + name = SU2_MSH; sourceTree = ""; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 05E6DC5017EB637300FA1F7E /* SU2_MAC.cpp */, + 05E6DC5017EB637300FA1F7E /* SU2_MSH.cpp */, 05E6DB4117EB61CC00FA1F7E /* config_structure.cpp */, 05E6DB4217EB61CC00FA1F7E /* dual_grid_structure.cpp */, 05E6DB4317EB61CC00FA1F7E /* geometry_structure.cpp */, @@ -141,7 +141,7 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 05AB07A313764A35008163E7 /* SU2_MAC */, + 05AB07A313764A35008163E7 /* SU2_MSH */, ); name = Products; sourceTree = ""; @@ -149,9 +149,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD76F620486A84900D96B5E /* SU2_MAC */ = { + 8DD76F620486A84900D96B5E /* SU2_MSH */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MAC" */; + buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MSH" */; buildPhases = ( 8DD76F640486A84900D96B5E /* Sources */, 8DD76F660486A84900D96B5E /* Frameworks */, @@ -161,10 +161,10 @@ ); dependencies = ( ); - name = SU2_MAC; + name = SU2_MSH; productInstallPath = "$(HOME)/bin"; - productName = SU2_MAC; - productReference = 05AB07A313764A35008163E7 /* SU2_MAC */; + productName = SU2_MSH; + productReference = 05AB07A313764A35008163E7 /* SU2_MSH */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -175,7 +175,7 @@ attributes = { LastUpgradeCheck = 0500; }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MAC" */; + buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MSH" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -185,11 +185,11 @@ French, German, ); - mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_MAC */; + mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_MSH */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DD76F620486A84900D96B5E /* SU2_MAC */, + 8DD76F620486A84900D96B5E /* SU2_MSH */, ); }; /* End PBXProject section */ @@ -208,7 +208,7 @@ 05E6DB5017EB61CC00FA1F7E /* matrix_structure.cpp in Sources */, 05E6DB5117EB61CC00FA1F7E /* primal_grid_structure.cpp in Sources */, 05E6DB5217EB61CC00FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC5117EB637300FA1F7E /* SU2_MAC.cpp in Sources */, + 05E6DC5117EB637300FA1F7E /* SU2_MSH.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -235,7 +235,7 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_SHADOW = YES; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_MAC; + PRODUCT_NAME = SU2_MSH; SDKROOT = ""; }; name = Debug; @@ -257,7 +257,7 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_SHADOW = YES; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = SU2_MAC; + PRODUCT_NAME = SU2_MSH; SDKROOT = ""; }; name = Release; @@ -296,7 +296,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MAC" */ = { + 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "SU2_MSH" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */, @@ -305,7 +305,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MAC" */ = { + 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_MSH" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, diff --git a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 71% rename from SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 2bdff136e09..b9e9a590c67 100644 --- a/SU2_IDE/Xcode/SU2_MAC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:SU2_MSH.xcodeproj"> diff --git a/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/xcshareddata/SU2_MSH.xccheckout b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/xcshareddata/SU2_MSH.xccheckout new file mode 100644 index 00000000000..f08a27463f9 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace/xcshareddata/SU2_MSH.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + B8F34478-2ABB-4316-9049-C10D259F5023 + IDESourceControlProjectName + SU2_MSH + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_MSH.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.mode1v3 deleted file mode 100644 index 306cee50354..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.mode1v3 +++ /dev/null @@ -1,1396 +0,0 @@ - - - - - ActivePerspectiveName - Project - AllowedModules - - - BundleLoadPath - - MaxInstances - n - Module - PBXSmartGroupTreeModule - Name - Groups and Files Outline View - - - BundleLoadPath - - MaxInstances - n - Module - PBXNavigatorGroup - Name - Editor - - - BundleLoadPath - - MaxInstances - n - Module - XCTaskListModule - Name - Task List - - - BundleLoadPath - - MaxInstances - n - Module - XCDetailModule - Name - File and Smart Group Detail Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXBuildResultsModule - Name - Detailed Build Results Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXProjectFindModule - Name - Project Batch Find Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCProjectFormatConflictsModule - Name - Project Format Conflicts List - - - BundleLoadPath - - MaxInstances - n - Module - PBXBookmarksModule - Name - Bookmarks Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXClassBrowserModule - Name - Class Browser - - - BundleLoadPath - - MaxInstances - n - Module - PBXCVSModule - Name - Source Code Control Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXDebugBreakpointsModule - Name - Debug Breakpoints Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCDockableInspector - Name - Inspector - - - BundleLoadPath - - MaxInstances - n - Module - PBXOpenQuicklyModule - Name - Open Quickly Tool - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugSessionModule - Name - Debugger - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugCLIModule - Name - Debug Console - - - BundleLoadPath - - MaxInstances - n - Module - XCSnapshotModule - Name - Snapshots Tool - - - BundlePath - /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources - Description - DefaultDescriptionKey - DockingSystemVisible - - Extension - mode1v3 - FavBarConfig - - PBXProjectModuleGUID - 05EADA8A13E4C0320093BD56 - XCBarModuleItemNames - - XCBarModuleItems - - - FirstTimeWindowDisplayed - - Identifier - com.apple.perspectives.project.mode1v3 - MajorVersion - 33 - MinorVersion - 0 - Name - Default - Notifications - - OpenEditors - - PerspectiveWidths - - -1 - -1 - - Perspectives - - - ChosenToolbarItems - - active-combo-popup - action - NSToolbarFlexibleSpaceItem - debugger-enable-breakpoints - build-and-go - com.apple.ide.PBXToolbarStopButton - get-info - NSToolbarFlexibleSpaceItem - com.apple.pbx.toolbar.searchfield - - ControllerClassBaseName - - IconName - WindowOfProjectWithEditor - Identifier - perspective.project - IsVertical - - Layout - - - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 247 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 08FB7794FE84155DC02AAC07 - 05EADA9713E4C05C0093BD56 - 05EADA9613E4C0550093BD56 - 08FB7795FE84155DC02AAC07 - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 14 - 13 - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {247, 795}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {264, 813}} - GroupTreeTableConfiguration - - MainColumn - 247 - - RubberWindowFrame - 57 204 1222 854 0 0 1920 1058 - - Module - PBXSmartGroupTreeModule - Proportion - 264pt - - - Dock - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20306471E060097A5F4 - PBXProjectModuleLabel - geometry_structure.cpp - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CE0B20406471E060097A5F4 - PBXProjectModuleLabel - geometry_structure.cpp - _historyCapacity - 0 - bookmark - 056D803E16D3033D00B5E489 - history - - 05B42B9F13E5F13000BCFE83 - 05B42BBF13E5F42100BCFE83 - 05B42BC313E5F42100BCFE83 - 053FD71516C725CF00497B9F - 053FD71616C725CF00497B9F - 053FD71716C725CF00497B9F - 056D803B16D3033D00B5E489 - 056D803C16D3033D00B5E489 - 056D803D16D3033D00B5E489 - - - SplitCount - 1 - - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {953, 808}} - RubberWindowFrame - 57 204 1222 854 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 808pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CE0B20506471E060097A5F4 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{0, 813}, {953, 0}} - RubberWindowFrame - 57 204 1222 854 0 0 1920 1058 - - Module - XCDetailModule - Proportion - 0pt - - - Proportion - 953pt - - - Name - Project - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - XCModuleDock - PBXNavigatorGroup - XCDetailModule - - TableOfContents - - 056D803F16D3033D00B5E489 - 1CE0B1FE06471DED0097A5F4 - 056D804016D3033D00B5E489 - 1CE0B20306471E060097A5F4 - 1CE0B20506471E060097A5F4 - - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarConfiguration - xcode.toolbar.config.defaultV3 - - - ControllerClassBaseName - - IconName - WindowOfProject - Identifier - perspective.morph - IsVertical - 0 - Layout - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C08E77C0454961000C914BD - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - - PBXProjectModuleGUID - 11E0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 186 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 29B97314FDCFA39411CA2CEA - 1C37FABC05509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 337}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 1 - XCSharingToken - com.apple.Xcode.GFSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {203, 355}} - GroupTreeTableConfiguration - - MainColumn - 186 - - RubberWindowFrame - 373 269 690 397 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 100% - - - Name - Morph - PreferredWidth - 300 - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - - TableOfContents - - 11E0B1FE06471DED0097A5F4 - - ToolbarConfiguration - xcode.toolbar.config.default.shortV3 - - - PerspectivesBarVisible - - ShelfIsVisible - - SourceDescription - file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec' - StatusbarIsVisible - - TimeStamp - 0.0 - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarDisplayMode - 1 - ToolbarIsVisible - - ToolbarSizeMode - 1 - Type - Perspectives - UpdateMessage - The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'? - WindowJustification - 5 - WindowOrderList - - 05EADA8B13E4C0320093BD56 - /Users/fpalacios/SU2/trunk/SU2_PBC/SU2_PBC.xcodeproj - - WindowString - 57 204 1222 854 0 0 1920 1058 - WindowToolsV3 - - - FirstTimeWindowDisplayed - - Identifier - windowTool.build - IsVertical - - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528F0623707200166675 - PBXProjectModuleLabel - - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {942, 297}} - RubberWindowFrame - 353 290 942 579 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 297pt - - - ContentConfiguration - - PBXProjectModuleGUID - XCMainBuildResultsModuleGUID - PBXProjectModuleLabel - Build Results - XCBuildResultsTrigger_Collapse - 1021 - XCBuildResultsTrigger_Open - 1011 - - GeometryConfiguration - - Frame - {{0, 302}, {942, 236}} - RubberWindowFrame - 353 290 942 579 0 0 1920 1058 - - Module - PBXBuildResultsModule - Proportion - 236pt - - - Proportion - 538pt - - - Name - Build Results - ServiceClasses - - PBXBuildResultsModule - - StatusbarIsVisible - - TableOfContents - - 05EADA8B13E4C0320093BD56 - 056D804116D3033D00B5E489 - 1CD0528F0623707200166675 - XCMainBuildResultsModuleGUID - - ToolbarConfiguration - xcode.toolbar.config.buildV3 - WindowContentMinSize - 486 300 - WindowString - 353 290 942 579 0 0 1920 1058 - WindowToolGUID - 05EADA8B13E4C0320093BD56 - WindowToolIsVisible - - - - FirstTimeWindowDisplayed - - Identifier - windowTool.debugger - IsVertical - - Layout - - - Dock - - - ContentConfiguration - - Debugger - - HorizontalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {316, 203}} - {{316, 0}, {378, 203}} - - - VerticalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {694, 203}} - {{0, 203}, {694, 178}} - - - - LauncherConfigVersion - 8 - PBXProjectModuleGUID - 1C162984064C10D400B95A72 - PBXProjectModuleLabel - Debug - GLUTExamples (Underwater) - - GeometryConfiguration - - DebugConsoleVisible - None - DebugConsoleWindowFrame - {{200, 200}, {500, 300}} - DebugSTDIOWindowFrame - {{200, 200}, {500, 300}} - Frame - {{0, 0}, {694, 381}} - PBXDebugSessionStackFrameViewKey - - DebugVariablesTableConfiguration - - Name - 120 - Value - 85 - Summary - 148 - - Frame - {{316, 0}, {378, 203}} - RubberWindowFrame - 429 592 694 422 0 0 1920 1058 - - RubberWindowFrame - 429 592 694 422 0 0 1920 1058 - - Module - PBXDebugSessionModule - Proportion - 381pt - - - Proportion - 381pt - - - Name - Debugger - ServiceClasses - - PBXDebugSessionModule - - StatusbarIsVisible - - TableOfContents - - 1CD10A99069EF8BA00B06720 - 053FD70316C6D40100497B9F - 1C162984064C10D400B95A72 - 053FD70416C6D40100497B9F - 053FD70516C6D40100497B9F - 053FD70616C6D40100497B9F - 053FD70716C6D40100497B9F - 053FD70816C6D40100497B9F - - ToolbarConfiguration - xcode.toolbar.config.debugV3 - WindowString - 429 592 694 422 0 0 1920 1058 - WindowToolGUID - 1CD10A99069EF8BA00B06720 - WindowToolIsVisible - - - - FirstTimeWindowDisplayed - - Identifier - windowTool.find - IsVertical - - Layout - - - Dock - - - Dock - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - 1CDD528C0622207200134675 - PBXProjectModuleLabel - geometry_structure.cpp - StatusBarVisibility - - - GeometryConfiguration - - Frame - {{0, 0}, {887, 332}} - RubberWindowFrame - 1033 295 887 670 0 0 1920 1058 - - Module - PBXNavigatorGroup - Proportion - 887pt - - - Proportion - 332pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528E0623707200166675 - PBXProjectModuleLabel - Project Find - - GeometryConfiguration - - Frame - {{0, 337}, {887, 292}} - RubberWindowFrame - 1033 295 887 670 0 0 1920 1058 - - Module - PBXProjectFindModule - Proportion - 292pt - - - Proportion - 629pt - - - Name - Project Find - ServiceClasses - - PBXProjectFindModule - - StatusbarIsVisible - - TableOfContents - - 1C530D57069F1CE1000CFCEE - 053FD71016C6D40100497B9F - 053FD71116C6D40100497B9F - 1CDD528C0622207200134675 - 1CD0528E0623707200166675 - - WindowString - 1033 295 887 670 0 0 1920 1058 - WindowToolGUID - 1C530D57069F1CE1000CFCEE - WindowToolIsVisible - - - - Identifier - MENUSEPARATOR - - - FirstTimeWindowDisplayed - - Identifier - windowTool.debuggerConsole - IsVertical - - Layout - - - Dock - - - BecomeActive - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAAC065D492600B07095 - PBXProjectModuleLabel - Debugger Console - - GeometryConfiguration - - Frame - {{0, 0}, {848, 467}} - RubberWindowFrame - 720 484 848 508 0 0 1920 1058 - - Module - PBXDebugCLIModule - Proportion - 467pt - - - Proportion - 467pt - - - Name - Debugger Console - ServiceClasses - - PBXDebugCLIModule - - StatusbarIsVisible - - TableOfContents - - 1C78EAAD065D492600B07095 - 053FD71216C6D40100497B9F - 1C78EAAC065D492600B07095 - - ToolbarConfiguration - xcode.toolbar.config.consoleV3 - WindowString - 720 484 848 508 0 0 1920 1058 - WindowToolGUID - 1C78EAAD065D492600B07095 - WindowToolIsVisible - - - - Identifier - windowTool.snapshots - Layout - - - Dock - - - Module - XCSnapshotModule - Proportion - 100% - - - Proportion - 100% - - - Name - Snapshots - ServiceClasses - - XCSnapshotModule - - StatusbarIsVisible - Yes - ToolbarConfiguration - xcode.toolbar.config.snapshots - WindowString - 315 824 300 550 0 0 1440 878 - WindowToolIsVisible - Yes - - - Identifier - windowTool.scm - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAB2065D492600B07095 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1C78EAB3065D492600B07095 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {452, 0}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - - Module - PBXNavigatorGroup - Proportion - 0pt - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD052920623707200166675 - PBXProjectModuleLabel - SCM - - GeometryConfiguration - - ConsoleFrame - {{0, 259}, {452, 0}} - Frame - {{0, 7}, {452, 259}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - TableConfiguration - - Status - 30 - FileName - 199 - Path - 197.0950012207031 - - TableFrame - {{0, 0}, {452, 250}} - - Module - PBXCVSModule - Proportion - 262pt - - - Proportion - 266pt - - - Name - SCM - ServiceClasses - - PBXCVSModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAB4065D492600B07095 - 1C78EAB5065D492600B07095 - 1C78EAB2065D492600B07095 - 1CD052920623707200166675 - - ToolbarConfiguration - xcode.toolbar.config.scm - WindowString - 743 379 452 308 0 0 1280 1002 - - - Identifier - windowTool.breakpoints - IsVertical - 0 - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C77FABC04509CD000000102 - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - no - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 168 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 1C77FABC04509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 0 - - GeometryConfiguration - - Frame - {{0, 0}, {185, 368}} - GroupTreeTableConfiguration - - MainColumn - 168 - - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 185pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA1AED706398EBD00589147 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{190, 0}, {554, 368}} - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - XCDetailModule - Proportion - 554pt - - - Proportion - 368pt - - - MajorVersion - 3 - MinorVersion - 0 - Name - Breakpoints - ServiceClasses - - PBXSmartGroupTreeModule - XCDetailModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CDDB66807F98D9800BB5817 - 1CDDB66907F98D9800BB5817 - 1CE0B1FE06471DED0097A5F4 - 1CA1AED706398EBD00589147 - - ToolbarConfiguration - xcode.toolbar.config.breakpointsV3 - WindowString - 315 424 744 409 0 0 1440 878 - WindowToolGUID - 1CDDB66807F98D9800BB5817 - WindowToolIsVisible - 1 - - - Identifier - windowTool.debugAnimator - Layout - - - Dock - - - Module - PBXNavigatorGroup - Proportion - 100% - - - Proportion - 100% - - - Name - Debug Visualizer - ServiceClasses - - PBXNavigatorGroup - - StatusbarIsVisible - 1 - ToolbarConfiguration - xcode.toolbar.config.debugAnimatorV3 - WindowString - 100 100 700 500 0 0 1280 1002 - - - Identifier - windowTool.bookmarks - Layout - - - Dock - - - Module - PBXBookmarksModule - Proportion - 100% - - - Proportion - 100% - - - Name - Bookmarks - ServiceClasses - - PBXBookmarksModule - - StatusbarIsVisible - 0 - WindowString - 538 42 401 187 0 0 1280 1002 - - - Identifier - windowTool.projectFormatConflicts - Layout - - - Dock - - - Module - XCProjectFormatConflictsModule - Proportion - 100% - - - Proportion - 100% - - - Name - Project Format Conflicts - ServiceClasses - - XCProjectFormatConflictsModule - - StatusbarIsVisible - 0 - WindowContentMinSize - 450 300 - WindowString - 50 850 472 307 0 0 1440 877 - - - Identifier - windowTool.classBrowser - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - OptionsSetName - Hierarchy, all classes - PBXProjectModuleGUID - 1CA6456E063B45B4001379D8 - PBXProjectModuleLabel - Class Browser - NSObject - - GeometryConfiguration - - ClassesFrame - {{0, 0}, {374, 96}} - ClassesTreeTableConfiguration - - PBXClassNameColumnIdentifier - 208 - PBXClassBookColumnIdentifier - 22 - - Frame - {{0, 0}, {630, 331}} - MembersFrame - {{0, 105}, {374, 395}} - MembersTreeTableConfiguration - - PBXMemberTypeIconColumnIdentifier - 22 - PBXMemberNameColumnIdentifier - 216 - PBXMemberTypeColumnIdentifier - 97 - PBXMemberBookColumnIdentifier - 22 - - PBXModuleWindowStatusBarHidden2 - 1 - RubberWindowFrame - 385 179 630 352 0 0 1440 878 - - Module - PBXClassBrowserModule - Proportion - 332pt - - - Proportion - 332pt - - - Name - Class Browser - ServiceClasses - - PBXClassBrowserModule - - StatusbarIsVisible - 0 - TableOfContents - - 1C0AD2AF069F1E9B00FABCE6 - 1C0AD2B0069F1E9B00FABCE6 - 1CA6456E063B45B4001379D8 - - ToolbarConfiguration - xcode.toolbar.config.classbrowser - WindowString - 385 179 630 352 0 0 1440 878 - WindowToolGUID - 1C0AD2AF069F1E9B00FABCE6 - WindowToolIsVisible - 0 - - - Identifier - windowTool.refactoring - IncludeInToolsMenu - 0 - Layout - - - Dock - - - BecomeActive - 1 - GeometryConfiguration - - Frame - {0, 0}, {500, 335} - RubberWindowFrame - {0, 0}, {500, 335} - - Module - XCRefactoringModule - Proportion - 100% - - - Proportion - 100% - - - Name - Refactoring - ServiceClasses - - XCRefactoringModule - - WindowString - 200 200 500 356 0 0 1920 1200 - - - - diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.pbxuser deleted file mode 100644 index 04162f2be32..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/fpalacios.pbxuser +++ /dev/null @@ -1,348 +0,0 @@ -// !$*UTF8*$! -{ - 052EE31E14A18F6000762B61 /* default.cfg */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {3057, 6240}}"; - sepNavSelRange = "{4536, 0}"; - sepNavVisRange = "{2625, 2301}"; - }; - }; - 053FD71516C725CF00497B9F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAA213E4C08E0093BD56 /* geometry_structure.hpp */; - name = "geometry_structure.hpp: 95"; - rLen = 19; - rLoc = 4023; - rType = 0; - vrLen = 3071; - vrLoc = 3155; - }; - 053FD71616C725CF00497B9F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 052EE31E14A18F6000762B61 /* default.cfg */; - name = "default.cfg: 120"; - rLen = 0; - rLoc = 4536; - rType = 0; - vrLen = 2301; - vrLoc = 2625; - }; - 053FD71716C725CF00497B9F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAA013E4C08E0093BD56 /* config_structure.hpp */; - name = "config_structure.hpp: 14"; - rLen = 0; - rLoc = 630; - rType = 0; - vrLen = 4389; - vrLoc = 6364; - }; - 056D803B16D3033D00B5E489 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADA9F13E4C0790093BD56 /* SU2_PBC.hpp */; - name = "SU2_PBC.hpp: 6"; - rLen = 0; - rLoc = 274; - rType = 0; - vrLen = 1277; - vrLoc = 0; - }; - 056D803C16D3033D00B5E489 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADA9B13E4C0700093BD56 /* SU2_PBC.cpp */; - name = "SU2_PBC.cpp: 75"; - rLen = 19; - rLoc = 3056; - rType = 0; - vrLen = 2839; - vrLoc = 1156; - }; - 056D803D16D3033D00B5E489 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAAA13E4C0A40093BD56 /* geometry_structure.cpp */; - rLen = 1; - rLoc = 4642; - rType = 1; - }; - 056D803E16D3033D00B5E489 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAAA13E4C0A40093BD56 /* geometry_structure.cpp */; - name = "geometry_structure.cpp: 4643"; - rLen = 63; - rLoc = 176750; - rType = 0; - vrLen = 2121; - vrLoc = 191835; - }; - 05B42B9F13E5F13000BCFE83 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAAB13E4C0A40093BD56 /* primal_grid_structure.cpp */; - name = "primal_grid_structure.cpp: 58"; - rLen = 8; - rLoc = 1787; - rType = 0; - vrLen = 942; - vrLoc = 1756; - }; - 05B42BBF13E5F42100BCFE83 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAA413E4C0980093BD56 /* config_structure.inl */; - name = "config_structure.inl: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1223; - vrLoc = 0; - }; - 05B42BC313E5F42100BCFE83 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 05EADAA913E4C0A40093BD56 /* dual_grid_structure.cpp */; - name = "dual_grid_structure.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 979; - vrLoc = 0; - }; - 05EADA8D13E4C0320093BD56 /* Source Control */ = { - isa = PBXSourceControlManager; - fallbackIsa = XCSourceControlManager; - isSCMEnabled = 0; - scmConfiguration = { - repositoryNamesForRoots = { - "" = ""; - }; - }; - }; - 05EADA8E13E4C0320093BD56 /* Code sense */ = { - isa = PBXCodeSenseManager; - indexTemplatePath = ""; - }; - 05EADA9B13E4C0700093BD56 /* SU2_PBC.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {892, 1287}}"; - sepNavSelRange = "{3056, 19}"; - sepNavVisRange = "{1156, 2839}"; - sepNavWindowFrame = "{{0, 63}, {1280, 715}}"; - }; - }; - 05EADA9E13E4C0700093BD56 /* CFD_PBC */ = { - isa = PBXExecutable; - activeArgIndices = ( - ); - argumentStrings = ( - ); - autoAttachOnCrash = 1; - breakpointsEnabled = 0; - configStateDict = { - }; - customDataFormattersEnabled = 1; - dataTipCustomDataFormattersEnabled = 1; - dataTipShowTypeColumn = 1; - dataTipSortType = 0; - debuggerPlugin = GDBDebugging; - disassemblyDisplayState = 0; - dylibVariantSuffix = ""; - enableDebugStr = 1; - environmentEntries = ( - ); - executableSystemSymbolLevel = 0; - executableUserSymbolLevel = 0; - libgmallocEnabled = 0; - name = CFD_PBC; - savedGlobals = { - }; - showTypeColumn = 0; - sourceDirectories = ( - ); - variableFormatDictionary = { - }; - }; - 05EADA9F13E4C0790093BD56 /* SU2_PBC.hpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {892, 776}}"; - sepNavSelRange = "{274, 0}"; - sepNavVisRange = "{0, 1277}"; - }; - }; - 05EADAA013E4C08E0093BD56 /* config_structure.hpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {915, 50193}}"; - sepNavSelRange = "{630, 0}"; - sepNavVisRange = "{6364, 4389}"; - }; - }; - 05EADAA113E4C08E0093BD56 /* dual_grid_structure.hpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {826, 12012}}"; - sepNavSelRange = "{26526, 0}"; - sepNavVisRange = "{26125, 931}"; - }; - }; - 05EADAA213E4C08E0093BD56 /* geometry_structure.hpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1006, 17459}}"; - sepNavSelRange = "{4023, 19}"; - sepNavVisRange = "{3155, 3071}"; - }; - }; - 05EADAA313E4C08E0093BD56 /* primal_grid_structure.hpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 14768}}"; - sepNavSelRange = "{6007, 16}"; - sepNavVisRange = "{5665, 991}"; - }; - }; - 05EADAA413E4C0980093BD56 /* config_structure.inl */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 5226}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1223}"; - }; - }; - 05EADAA513E4C0980093BD56 /* dual_grid_structure.inl */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {826, 3666}}"; - sepNavSelRange = "{9871, 0}"; - sepNavVisRange = "{9211, 869}"; - }; - }; - 05EADAA613E4C0980093BD56 /* geometry_structure.inl */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1152, 2158}}"; - sepNavSelRange = "{1740, 86}"; - sepNavVisRange = "{1272, 1587}"; - }; - }; - 05EADAA713E4C0980093BD56 /* primal_grid_structure.inl */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 2873}}"; - sepNavSelRange = "{599, 0}"; - sepNavVisRange = "{41, 1595}"; - }; - }; - 05EADAA813E4C0A40093BD56 /* config_structure.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 44239}}"; - sepNavSelRange = "{117122, 0}"; - sepNavVisRange = "{115148, 1814}"; - }; - }; - 05EADAA913E4C0A40093BD56 /* dual_grid_structure.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 4797}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 979}"; - }; - }; - 05EADAAA13E4C0A40093BD56 /* geometry_structure.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1118, 112528}}"; - sepNavSelRange = "{176750, 63}"; - sepNavVisRange = "{191835, 2121}"; - sepNavWindowFrame = "{{0, 63}, {1280, 715}}"; - }; - }; - 05EADAAB13E4C0A40093BD56 /* primal_grid_structure.cpp */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1152, 6318}}"; - sepNavSelRange = "{2165, 0}"; - sepNavVisRange = "{1698, 1015}"; - }; - }; - 08FB7793FE84155DC02AAC07 /* Project object */ = { - activeBuildConfigurationName = Debug; - activeExecutable = 05EADA9E13E4C0700093BD56 /* CFD_PBC */; - activeTarget = 8DD76F620486A84900D96B5E /* CFD_PBC */; - addToTargets = ( - 8DD76F620486A84900D96B5E /* CFD_PBC */, - ); - breakpoints = ( - ); - codeSenseManager = 05EADA8E13E4C0320093BD56 /* Code sense */; - executables = ( - 05EADA9E13E4C0700093BD56 /* CFD_PBC */, - ); - perUserDictionary = { - PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { - PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; - PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; - PBXFileTableDataSourceColumnWidthsKey = ( - 20, - 714, - 20, - 48, - 43, - 43, - 20, - ); - PBXFileTableDataSourceColumnsKey = ( - PBXFileDataSource_FiletypeID, - PBXFileDataSource_Filename_ColumnID, - PBXFileDataSource_Built_ColumnID, - PBXFileDataSource_ObjectSize_ColumnID, - PBXFileDataSource_Errors_ColumnID, - PBXFileDataSource_Warnings_ColumnID, - PBXFileDataSource_Target_ColumnID, - ); - }; - PBXConfiguration.PBXFileTableDataSource3.PBXFindDataSource = { - PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; - PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID; - PBXFileTableDataSourceColumnWidthsKey = ( - 200, - 847, - ); - PBXFileTableDataSourceColumnsKey = ( - PBXFindDataSource_MessageID, - PBXFindDataSource_LocationID, - ); - }; - PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { - PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; - PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; - PBXFileTableDataSourceColumnWidthsKey = ( - 20, - 301, - 60, - 20, - 48.16259765625, - 43, - 43, - ); - PBXFileTableDataSourceColumnsKey = ( - PBXFileDataSource_FiletypeID, - PBXFileDataSource_Filename_ColumnID, - PBXTargetDataSource_PrimaryAttribute, - PBXFileDataSource_Built_ColumnID, - PBXFileDataSource_ObjectSize_ColumnID, - PBXFileDataSource_Errors_ColumnID, - PBXFileDataSource_Warnings_ColumnID, - ); - }; - PBXPerProjectTemplateStateSaveDate = 382927606; - PBXWorkspaceStateSaveDate = 382927606; - }; - perUserProjectItems = { - 053FD71516C725CF00497B9F /* PBXTextBookmark */ = 053FD71516C725CF00497B9F /* PBXTextBookmark */; - 053FD71616C725CF00497B9F /* PBXTextBookmark */ = 053FD71616C725CF00497B9F /* PBXTextBookmark */; - 053FD71716C725CF00497B9F /* PBXTextBookmark */ = 053FD71716C725CF00497B9F /* PBXTextBookmark */; - 056D803B16D3033D00B5E489 /* PBXTextBookmark */ = 056D803B16D3033D00B5E489 /* PBXTextBookmark */; - 056D803C16D3033D00B5E489 /* PBXTextBookmark */ = 056D803C16D3033D00B5E489 /* PBXTextBookmark */; - 056D803D16D3033D00B5E489 /* PBXTextBookmark */ = 056D803D16D3033D00B5E489 /* PBXTextBookmark */; - 056D803E16D3033D00B5E489 /* PBXTextBookmark */ = 056D803E16D3033D00B5E489 /* PBXTextBookmark */; - 05B42B9F13E5F13000BCFE83 /* PBXTextBookmark */ = 05B42B9F13E5F13000BCFE83 /* PBXTextBookmark */; - 05B42BBF13E5F42100BCFE83 /* PBXTextBookmark */ = 05B42BBF13E5F42100BCFE83 /* PBXTextBookmark */; - 05B42BC313E5F42100BCFE83 /* PBXTextBookmark */ = 05B42BC313E5F42100BCFE83 /* PBXTextBookmark */; - }; - sourceControlManager = 05EADA8D13E4C0320093BD56 /* Source Control */; - userBuildSettings = { - }; - }; - 8DD76F620486A84900D96B5E /* CFD_PBC */ = { - activeExec = 0; - executables = ( - 05EADA9E13E4C0700093BD56 /* CFD_PBC */, - ); - }; -} diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.pbxproj deleted file mode 100644 index 4b3e5039bb9..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.pbxproj +++ /dev/null @@ -1,302 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 05E6DB8017EB61E100FA1F7E /* config_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7717EB61E100FA1F7E /* config_structure.cpp */; }; - 05E6DB8117EB61E100FA1F7E /* dual_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7817EB61E100FA1F7E /* dual_grid_structure.cpp */; }; - 05E6DB8217EB61E100FA1F7E /* geometry_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7917EB61E100FA1F7E /* geometry_structure.cpp */; }; - 05E6DB8317EB61E100FA1F7E /* grid_adaptation_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7A17EB61E100FA1F7E /* grid_adaptation_structure.cpp */; }; - 05E6DB8417EB61E100FA1F7E /* grid_movement_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7B17EB61E100FA1F7E /* grid_movement_structure.cpp */; }; - 05E6DB8517EB61E100FA1F7E /* linear_solvers_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7C17EB61E100FA1F7E /* linear_solvers_structure.cpp */; }; - 05E6DB8617EB61E100FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7D17EB61E100FA1F7E /* matrix_structure.cpp */; }; - 05E6DB8717EB61E100FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7E17EB61E100FA1F7E /* primal_grid_structure.cpp */; }; - 05E6DB8817EB61E100FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB7F17EB61E100FA1F7E /* vector_structure.cpp */; }; - 05E6DC4817EB62C300FA1F7E /* SU2_PBC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC4717EB62C300FA1F7E /* SU2_PBC.cpp */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 8DD76F690486A84900D96B5E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 8; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 0514CF8D16DEF6D400ADB9D2 /* CFD_PBC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CFD_PBC; sourceTree = BUILT_PRODUCTS_DIR; }; - 055A50EA1925A77000EC88B0 /* config_template.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_template.cfg; path = ../../config_template.cfg; sourceTree = ""; }; - 05E6DA9617EB600500FA1F7E /* config_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_structure.inl; path = ../../Common/include/config_structure.inl; sourceTree = ""; }; - 05E6DA9717EB600500FA1F7E /* dual_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = dual_grid_structure.inl; path = ../../Common/include/dual_grid_structure.inl; sourceTree = ""; }; - 05E6DA9817EB600500FA1F7E /* geometry_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = geometry_structure.inl; path = ../../Common/include/geometry_structure.inl; sourceTree = ""; }; - 05E6DA9917EB600500FA1F7E /* grid_adaptation_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = grid_adaptation_structure.inl; path = ../../Common/include/grid_adaptation_structure.inl; sourceTree = ""; }; - 05E6DA9A17EB600500FA1F7E /* grid_movement_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = grid_movement_structure.inl; path = ../../Common/include/grid_movement_structure.inl; sourceTree = ""; }; - 05E6DA9B17EB600500FA1F7E /* linear_solvers_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = linear_solvers_structure.inl; path = ../../Common/include/linear_solvers_structure.inl; sourceTree = ""; }; - 05E6DA9C17EB600500FA1F7E /* matrix_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = matrix_structure.inl; path = ../../Common/include/matrix_structure.inl; sourceTree = ""; }; - 05E6DA9D17EB600500FA1F7E /* primal_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = primal_grid_structure.inl; path = ../../Common/include/primal_grid_structure.inl; sourceTree = ""; }; - 05E6DA9E17EB600500FA1F7E /* vector_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = vector_structure.inl; path = ../../Common/include/vector_structure.inl; sourceTree = ""; }; - 05E6DACF17EB608700FA1F7E /* config_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = config_structure.hpp; path = ../../Common/include/config_structure.hpp; sourceTree = ""; }; - 05E6DAD017EB608700FA1F7E /* dual_grid_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = dual_grid_structure.hpp; path = ../../Common/include/dual_grid_structure.hpp; sourceTree = ""; }; - 05E6DAD117EB608700FA1F7E /* geometry_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = geometry_structure.hpp; path = ../../Common/include/geometry_structure.hpp; sourceTree = ""; }; - 05E6DAD217EB608700FA1F7E /* grid_adaptation_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = grid_adaptation_structure.hpp; path = ../../Common/include/grid_adaptation_structure.hpp; sourceTree = ""; }; - 05E6DAD317EB608700FA1F7E /* grid_movement_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = grid_movement_structure.hpp; path = ../../Common/include/grid_movement_structure.hpp; sourceTree = ""; }; - 05E6DAD417EB608700FA1F7E /* linear_solvers_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = linear_solvers_structure.hpp; path = ../../Common/include/linear_solvers_structure.hpp; sourceTree = ""; }; - 05E6DAD517EB608700FA1F7E /* matrix_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = matrix_structure.hpp; path = ../../Common/include/matrix_structure.hpp; sourceTree = ""; }; - 05E6DAD617EB608700FA1F7E /* option_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = option_structure.hpp; path = ../../Common/include/option_structure.hpp; sourceTree = ""; }; - 05E6DAD717EB608700FA1F7E /* primal_grid_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = primal_grid_structure.hpp; path = ../../Common/include/primal_grid_structure.hpp; sourceTree = ""; }; - 05E6DAD817EB608700FA1F7E /* vector_structure.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = vector_structure.hpp; path = ../../Common/include/vector_structure.hpp; sourceTree = ""; }; - 05E6DB7717EB61E100FA1F7E /* config_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = config_structure.cpp; path = ../../Common/src/config_structure.cpp; sourceTree = ""; }; - 05E6DB7817EB61E100FA1F7E /* dual_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dual_grid_structure.cpp; path = ../../Common/src/dual_grid_structure.cpp; sourceTree = ""; }; - 05E6DB7917EB61E100FA1F7E /* geometry_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geometry_structure.cpp; path = ../../Common/src/geometry_structure.cpp; sourceTree = ""; }; - 05E6DB7A17EB61E100FA1F7E /* grid_adaptation_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grid_adaptation_structure.cpp; path = ../../Common/src/grid_adaptation_structure.cpp; sourceTree = ""; }; - 05E6DB7B17EB61E100FA1F7E /* grid_movement_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grid_movement_structure.cpp; path = ../../Common/src/grid_movement_structure.cpp; sourceTree = ""; }; - 05E6DB7C17EB61E100FA1F7E /* linear_solvers_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = linear_solvers_structure.cpp; path = ../../Common/src/linear_solvers_structure.cpp; sourceTree = ""; }; - 05E6DB7D17EB61E100FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; - 05E6DB7E17EB61E100FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; - 05E6DB7F17EB61E100FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC4617EB62BE00FA1F7E /* SU2_PBC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_PBC.hpp; path = ../../SU2_PBC/include/SU2_PBC.hpp; sourceTree = ""; }; - 05E6DC4717EB62C300FA1F7E /* SU2_PBC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_PBC.cpp; path = ../../SU2_PBC/src/SU2_PBC.cpp; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8DD76F660486A84900D96B5E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 0514CF8E16DEF6D400ADB9D2 /* Products */ = { - isa = PBXGroup; - children = ( - 0514CF8D16DEF6D400ADB9D2 /* CFD_PBC */, - ); - name = Products; - sourceTree = ""; - }; - 05EADA9613E4C0550093BD56 /* Include */ = { - isa = PBXGroup; - children = ( - 05E6DC4617EB62BE00FA1F7E /* SU2_PBC.hpp */, - 05E6DACF17EB608700FA1F7E /* config_structure.hpp */, - 05E6DAD017EB608700FA1F7E /* dual_grid_structure.hpp */, - 05E6DAD117EB608700FA1F7E /* geometry_structure.hpp */, - 05E6DAD217EB608700FA1F7E /* grid_adaptation_structure.hpp */, - 05E6DAD317EB608700FA1F7E /* grid_movement_structure.hpp */, - 05E6DAD417EB608700FA1F7E /* linear_solvers_structure.hpp */, - 05E6DAD517EB608700FA1F7E /* matrix_structure.hpp */, - 05E6DAD617EB608700FA1F7E /* option_structure.hpp */, - 05E6DAD717EB608700FA1F7E /* primal_grid_structure.hpp */, - 05E6DAD817EB608700FA1F7E /* vector_structure.hpp */, - ); - name = Include; - sourceTree = ""; - }; - 05EADA9713E4C05C0093BD56 /* InLine */ = { - isa = PBXGroup; - children = ( - 05E6DA9617EB600500FA1F7E /* config_structure.inl */, - 05E6DA9717EB600500FA1F7E /* dual_grid_structure.inl */, - 05E6DA9817EB600500FA1F7E /* geometry_structure.inl */, - 05E6DA9917EB600500FA1F7E /* grid_adaptation_structure.inl */, - 05E6DA9A17EB600500FA1F7E /* grid_movement_structure.inl */, - 05E6DA9B17EB600500FA1F7E /* linear_solvers_structure.inl */, - 05E6DA9C17EB600500FA1F7E /* matrix_structure.inl */, - 05E6DA9D17EB600500FA1F7E /* primal_grid_structure.inl */, - 05E6DA9E17EB600500FA1F7E /* vector_structure.inl */, - ); - name = InLine; - sourceTree = ""; - }; - 08FB7794FE84155DC02AAC07 /* CFD_PBC */ = { - isa = PBXGroup; - children = ( - 055A50EA1925A77000EC88B0 /* config_template.cfg */, - 05EADA9713E4C05C0093BD56 /* InLine */, - 05EADA9613E4C0550093BD56 /* Include */, - 08FB7795FE84155DC02AAC07 /* Source */, - 0514CF8E16DEF6D400ADB9D2 /* Products */, - ); - name = CFD_PBC; - sourceTree = ""; - }; - 08FB7795FE84155DC02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 05E6DC4717EB62C300FA1F7E /* SU2_PBC.cpp */, - 05E6DB7717EB61E100FA1F7E /* config_structure.cpp */, - 05E6DB7817EB61E100FA1F7E /* dual_grid_structure.cpp */, - 05E6DB7917EB61E100FA1F7E /* geometry_structure.cpp */, - 05E6DB7A17EB61E100FA1F7E /* grid_adaptation_structure.cpp */, - 05E6DB7B17EB61E100FA1F7E /* grid_movement_structure.cpp */, - 05E6DB7C17EB61E100FA1F7E /* linear_solvers_structure.cpp */, - 05E6DB7D17EB61E100FA1F7E /* matrix_structure.cpp */, - 05E6DB7E17EB61E100FA1F7E /* primal_grid_structure.cpp */, - 05E6DB7F17EB61E100FA1F7E /* vector_structure.cpp */, - ); - name = Source; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8DD76F620486A84900D96B5E /* CFD_PBC */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "CFD_PBC" */; - buildPhases = ( - 8DD76F640486A84900D96B5E /* Sources */, - 8DD76F660486A84900D96B5E /* Frameworks */, - 8DD76F690486A84900D96B5E /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CFD_PBC; - productInstallPath = "$(HOME)/bin"; - productName = CFD_PBC; - productReference = 0514CF8D16DEF6D400ADB9D2 /* CFD_PBC */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 08FB7793FE84155DC02AAC07 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0460; - }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_PBC" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 08FB7794FE84155DC02AAC07 /* CFD_PBC */; - productRefGroup = 0514CF8E16DEF6D400ADB9D2 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8DD76F620486A84900D96B5E /* CFD_PBC */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 8DD76F640486A84900D96B5E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 05E6DB8017EB61E100FA1F7E /* config_structure.cpp in Sources */, - 05E6DB8117EB61E100FA1F7E /* dual_grid_structure.cpp in Sources */, - 05E6DB8217EB61E100FA1F7E /* geometry_structure.cpp in Sources */, - 05E6DB8317EB61E100FA1F7E /* grid_adaptation_structure.cpp in Sources */, - 05E6DB8417EB61E100FA1F7E /* grid_movement_structure.cpp in Sources */, - 05E6DB8517EB61E100FA1F7E /* linear_solvers_structure.cpp in Sources */, - 05E6DB8617EB61E100FA1F7E /* matrix_structure.cpp in Sources */, - 05E6DB8717EB61E100FA1F7E /* primal_grid_structure.cpp in Sources */, - 05E6DB8817EB61E100FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC4817EB62C300FA1F7E /* SU2_PBC.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1DEB923208733DC60010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = CFD_PBC; - SDKROOT = macosx10.8; - }; - name = Debug; - }; - 1DEB923308733DC60010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = CFD_PBC; - SDKROOT = macosx10.8; - }; - name = Release; - }; - 1DEB923608733DC60010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ( - NO_METIS, - NO_CGNS, - NO_OMP, - NO_MPI, - NO_MUTATIONPP, - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = ""; - }; - name = Debug; - }; - 1DEB923708733DC60010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = ""; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "CFD_PBC" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB923208733DC60010E9CD /* Debug */, - 1DEB923308733DC60010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_PBC" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB923608733DC60010E9CD /* Debug */, - 1DEB923708733DC60010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; -} diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index fb940700d73..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 6d8f1742b5a043e5a0be9064e8bbbd09d356b502..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38724 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 - - - - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - SnapshotAutomaticallyBeforeSignificantChanges - - - diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/CFD_PBC.xcscheme b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/CFD_PBC.xcscheme deleted file mode 100644 index f95aa34a667..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/CFD_PBC.xcscheme +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist b/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index fabdf575955..00000000000 --- a/SU2_IDE/Xcode/SU2_PBC.xcodeproj/xcuserdata/fpalacios.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - CFD_PBC.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 8DD76F620486A84900D96B5E - - primary - - - - - diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.mode1v3 b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.mode1v3 similarity index 99% rename from SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.mode1v3 rename to SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.mode1v3 index c236891ad92..f5b14d11669 100644 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.mode1v3 +++ b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.mode1v3 @@ -314,7 +314,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SU2_DDC.cpp + SU2_PRT.cpp PBXSplitModuleInNavigatorKey Split0 @@ -322,7 +322,7 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SU2_DDC.cpp + SU2_PRT.cpp _historyCapacity 0 bookmark @@ -600,7 +600,7 @@ WindowOrderList 05A1F2FC13782891001A69EC - /Users/fpalacios/SU2/trunk/SU2_DDC/SU2_DDC.xcodeproj + /Users/fpalacios/SU2/trunk/SU2_PRT/SU2_PRT.xcodeproj WindowString 7 189 1664 869 0 0 1920 1058 @@ -820,7 +820,7 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - SU2_DDC.hpp + SU2_PRT.hpp StatusBarVisibility diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.pbxuser b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.pbxuser similarity index 92% rename from SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.pbxuser rename to SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.pbxuser index 3541bf02cec..6683a5ab7ac 100644 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/fpalacios.pbxuser +++ b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/fpalacios.pbxuser @@ -1,16 +1,16 @@ // !$*UTF8*$! { - 050CCBF015DB23CB00BC0A81 /* SU2_DDC.cpp */ = { + 050CCBF015DB23CB00BC0A81 /* SU2_PRT.cpp */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; - name = SU2_DDC.cpp; - path = /Users/fpalacios/SU2/tags/SU2v1.1/SU2_DDC/src/SU2_DDC.cpp; + name = SU2_PRT.cpp; + path = /Users/fpalacios/SU2/tags/SU2v1.1/SU2_PRT/src/SU2_PRT.cpp; sourceTree = ""; }; 050CCBF215DB240A00BC0A81 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 050CCBF015DB23CB00BC0A81 /* SU2_DDC.cpp */; - name = "SU2_DDC.cpp: 53"; + fRef = 050CCBF015DB23CB00BC0A81 /* SU2_PRT.cpp */; + name = "SU2_PRT.cpp: 53"; rLen = 0; rLoc = 1957; rType = 0; @@ -36,8 +36,8 @@ }; 0525601D16D0A08B003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05A1F313137828B0001A69EC /* SU2_DDC.cpp */; - name = "SU2_DDC.cpp: 71"; + fRef = 05A1F313137828B0001A69EC /* SU2_PRT.cpp */; + name = "SU2_PRT.cpp: 71"; rLen = 14; rLoc = 2764; rType = 0; @@ -86,8 +86,8 @@ }; 0525624916D2CA5F003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05A1F313137828B0001A69EC /* SU2_DDC.cpp */; - name = "SU2_DDC.cpp: 12"; + fRef = 05A1F313137828B0001A69EC /* SU2_PRT.cpp */; + name = "SU2_PRT.cpp: 12"; rLen = 0; rLoc = 471; rType = 0; @@ -96,8 +96,8 @@ }; 0525624A16D2CA5F003F8805 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05A1F313137828B0001A69EC /* SU2_DDC.cpp */; - name = "SU2_DDC.cpp: 88"; + fRef = 05A1F313137828B0001A69EC /* SU2_PRT.cpp */; + name = "SU2_PRT.cpp: 88"; rLen = 0; rLoc = 3510; rType = 0; @@ -199,8 +199,8 @@ }; 05A0A0FD1633A1270009F9D8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 05A1F31A137828C6001A69EC /* SU2_DDC.hpp */; - name = "SU2_DDC.hpp: 8"; + fRef = 05A1F31A137828C6001A69EC /* SU2_PRT.hpp */; + name = "SU2_PRT.hpp: 8"; rLen = 0; rLoc = 326; rType = 0; @@ -221,7 +221,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 05A1F2F81378288F001A69EC /* SU2_DDC */ = { + 05A1F2F81378288F001A69EC /* SU2_PRT */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -243,12 +243,12 @@ executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; libgmallocEnabled = 0; - name = SU2_DDC; + name = SU2_PRT; showTypeColumn = 0; sourceDirectories = ( ); }; - 05A1F313137828B0001A69EC /* SU2_DDC.cpp */ = { + 05A1F313137828B0001A69EC /* SU2_PRT.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1373, 1612}}"; sepNavSelRange = "{3510, 0}"; @@ -256,7 +256,7 @@ sepNavWindowFrame = "{{38, 97}, {737, 674}}"; }; }; - 05A1F31A137828C6001A69EC /* SU2_DDC.hpp */ = { + 05A1F31A137828C6001A69EC /* SU2_PRT.hpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1026, 481}}"; sepNavSelRange = "{274, 0}"; @@ -385,14 +385,14 @@ }; 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 05A1F2F81378288F001A69EC /* SU2_DDC */; - activeTarget = 8DD76F620486A84900D96B5E /* SU2_DDC */; + activeExecutable = 05A1F2F81378288F001A69EC /* SU2_PRT */; + activeTarget = 8DD76F620486A84900D96B5E /* SU2_PRT */; addToTargets = ( - 8DD76F620486A84900D96B5E /* SU2_DDC */, + 8DD76F620486A84900D96B5E /* SU2_PRT */, ); codeSenseManager = 05A1F2F613782889001A69EC /* Code sense */; executables = ( - 05A1F2F81378288F001A69EC /* SU2_DDC */, + 05A1F2F81378288F001A69EC /* SU2_PRT */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -446,10 +446,10 @@ userBuildSettings = { }; }; - 8DD76F620486A84900D96B5E /* SU2_DDC */ = { + 8DD76F620486A84900D96B5E /* SU2_PRT */ = { activeExec = 0; executables = ( - 05A1F2F81378288F001A69EC /* SU2_DDC */, + 05A1F2F81378288F001A69EC /* SU2_PRT */, ); }; } diff --git a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.pbxproj similarity index 93% rename from SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.pbxproj rename to SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.pbxproj index b4c86327eb6..da4da1f2cba 100644 --- a/SU2_IDE/Xcode/SU2_DDC.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ 05E6DB1A17EB61B700FA1F7E /* matrix_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB1117EB61B700FA1F7E /* matrix_structure.cpp */; }; 05E6DB1B17EB61B700FA1F7E /* primal_grid_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB1217EB61B700FA1F7E /* primal_grid_structure.cpp */; }; 05E6DB1C17EB61B700FA1F7E /* vector_structure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DB1317EB61B700FA1F7E /* vector_structure.cpp */; }; - 05E6DC5D17EB651700FA1F7E /* SU2_DDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5C17EB651700FA1F7E /* SU2_DDC.cpp */; }; + 05E6DC5D17EB651700FA1F7E /* SU2_PRT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E6DC5C17EB651700FA1F7E /* SU2_PRT.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -33,7 +33,7 @@ /* Begin PBXFileReference section */ 0529A91E1925F54700C549AD /* config_template.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_template.cfg; path = ../../config_template.cfg; sourceTree = ""; }; - 05E4144317600FBB00A448E0 /* SU2_DDC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_DDC; sourceTree = BUILT_PRODUCTS_DIR; }; + 05E4144317600FBB00A448E0 /* SU2_PRT */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_PRT; sourceTree = BUILT_PRODUCTS_DIR; }; 05E6DA6017EB5F8600FA1F7E /* config_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = config_structure.inl; path = ../../Common/include/config_structure.inl; sourceTree = ""; }; 05E6DA6117EB5F8600FA1F7E /* dual_grid_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = dual_grid_structure.inl; path = ../../Common/include/dual_grid_structure.inl; sourceTree = ""; }; 05E6DA6217EB5F8600FA1F7E /* geometry_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = geometry_structure.inl; path = ../../Common/include/geometry_structure.inl; sourceTree = ""; }; @@ -62,8 +62,8 @@ 05E6DB1117EB61B700FA1F7E /* matrix_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = matrix_structure.cpp; path = ../../Common/src/matrix_structure.cpp; sourceTree = ""; }; 05E6DB1217EB61B700FA1F7E /* primal_grid_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = primal_grid_structure.cpp; path = ../../Common/src/primal_grid_structure.cpp; sourceTree = ""; }; 05E6DB1317EB61B700FA1F7E /* vector_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vector_structure.cpp; path = ../../Common/src/vector_structure.cpp; sourceTree = ""; }; - 05E6DC5B17EB651100FA1F7E /* SU2_DDC.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_DDC.hpp; path = ../../SU2_DDC/include/SU2_DDC.hpp; sourceTree = ""; }; - 05E6DC5C17EB651700FA1F7E /* SU2_DDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_DDC.cpp; path = ../../SU2_DDC/src/SU2_DDC.cpp; sourceTree = ""; }; + 05E6DC5B17EB651100FA1F7E /* SU2_PRT.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SU2_PRT.hpp; path = ../../SU2_PRT/include/SU2_PRT.hpp; sourceTree = ""; }; + 05E6DC5C17EB651700FA1F7E /* SU2_PRT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SU2_PRT.cpp; path = ../../SU2_PRT/src/SU2_PRT.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ 05E415471760111D00A448E0 /* Include */ = { isa = PBXGroup; children = ( - 05E6DC5B17EB651100FA1F7E /* SU2_DDC.hpp */, + 05E6DC5B17EB651100FA1F7E /* SU2_PRT.hpp */, 05E6DAB117EB606F00FA1F7E /* config_structure.hpp */, 05E6DAB217EB606F00FA1F7E /* dual_grid_structure.hpp */, 05E6DAB317EB606F00FA1F7E /* geometry_structure.hpp */, @@ -114,7 +114,7 @@ 05E415491760113500A448E0 /* Source */ = { isa = PBXGroup; children = ( - 05E6DC5C17EB651700FA1F7E /* SU2_DDC.cpp */, + 05E6DC5C17EB651700FA1F7E /* SU2_PRT.cpp */, 05E6DB0B17EB61B700FA1F7E /* config_structure.cpp */, 05E6DB0C17EB61B700FA1F7E /* dual_grid_structure.cpp */, 05E6DB0D17EB61B700FA1F7E /* geometry_structure.cpp */, @@ -128,7 +128,7 @@ name = Source; sourceTree = ""; }; - 08FB7794FE84155DC02AAC07 /* SU2_DDC */ = { + 08FB7794FE84155DC02AAC07 /* SU2_PRT */ = { isa = PBXGroup; children = ( 0529A91E1925F54700C549AD /* config_template.cfg */, @@ -137,13 +137,13 @@ 05E415491760113500A448E0 /* Source */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - name = SU2_DDC; + name = SU2_PRT; sourceTree = ""; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 05E4144317600FBB00A448E0 /* SU2_DDC */, + 05E4144317600FBB00A448E0 /* SU2_PRT */, ); name = Products; sourceTree = ""; @@ -151,9 +151,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 05E4144217600FBB00A448E0 /* SU2_DDC */ = { + 05E4144217600FBB00A448E0 /* SU2_PRT */ = { isa = PBXNativeTarget; - buildConfigurationList = 05E4144917600FBB00A448E0 /* Build configuration list for PBXNativeTarget "SU2_DDC" */; + buildConfigurationList = 05E4144917600FBB00A448E0 /* Build configuration list for PBXNativeTarget "SU2_PRT" */; buildPhases = ( 05E4143F17600FBB00A448E0 /* Sources */, 05E4144017600FBB00A448E0 /* Frameworks */, @@ -163,9 +163,9 @@ ); dependencies = ( ); - name = SU2_DDC; - productName = SU2_DDC; - productReference = 05E4144317600FBB00A448E0 /* SU2_DDC */; + name = SU2_PRT; + productName = SU2_PRT; + productReference = 05E4144317600FBB00A448E0 /* SU2_PRT */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ @@ -176,7 +176,7 @@ attributes = { LastUpgradeCheck = 0460; }; - buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DDC" */; + buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_PRT" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; @@ -186,11 +186,11 @@ French, German, ); - mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_DDC */; + mainGroup = 08FB7794FE84155DC02AAC07 /* SU2_PRT */; projectDirPath = ""; projectRoot = ""; targets = ( - 05E4144217600FBB00A448E0 /* SU2_DDC */, + 05E4144217600FBB00A448E0 /* SU2_PRT */, ); }; /* End PBXProject section */ @@ -209,7 +209,7 @@ 05E6DB1A17EB61B700FA1F7E /* matrix_structure.cpp in Sources */, 05E6DB1B17EB61B700FA1F7E /* primal_grid_structure.cpp in Sources */, 05E6DB1C17EB61B700FA1F7E /* vector_structure.cpp in Sources */, - 05E6DC5D17EB651700FA1F7E /* SU2_DDC.cpp in Sources */, + 05E6DC5D17EB651700FA1F7E /* SU2_PRT.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -315,7 +315,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 05E4144917600FBB00A448E0 /* Build configuration list for PBXNativeTarget "SU2_DDC" */ = { + 05E4144917600FBB00A448E0 /* Build configuration list for PBXNativeTarget "SU2_PRT" */ = { isa = XCConfigurationList; buildConfigurations = ( 05E4144A17600FBB00A448E0 /* Debug */, @@ -324,7 +324,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_DDC" */ = { + 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SU2_PRT" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, diff --git a/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000000..e3389d8a2cc --- /dev/null +++ b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DDC.xccheckout b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DDC.xccheckout new file mode 100644 index 00000000000..2c9d8db136b --- /dev/null +++ b/SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace/xcshareddata/SU2_DDC.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + E6760B0C-4202-40EC-96C3-961ECB25D14A + IDESourceControlProjectName + SU2_PRT + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_PRT.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.pbxproj b/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.pbxproj index 32d042d53de..cb4171a48a9 100644 --- a/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.pbxproj +++ b/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ 0593D53C16F2A810007C1809 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Francisco Palacios"; }; buildConfigurationList = 0593D53F16F2A810007C1809 /* Build configuration list for PBXProject "SU2_SOL" */; @@ -250,7 +250,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; @@ -286,7 +285,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; diff --git a/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcshareddata/SU2_SOL.xccheckout b/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcshareddata/SU2_SOL.xccheckout new file mode 100644 index 00000000000..bd869635546 --- /dev/null +++ b/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcshareddata/SU2_SOL.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + E9129E20-BB4E-423E-96D3-816818F53BAD + IDESourceControlProjectName + SU2_SOL + IDESourceControlProjectOriginsDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + https://github.com/su2code/SU2.git + + IDESourceControlProjectPath + SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + ../../../.. + + IDESourceControlProjectURL + https://github.com/su2code/SU2.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6F11F1E1-4883-41F1-8713-DFA6350E0816 + IDESourceControlWCCName + trunk + + + + diff --git a/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate b/SU2_IDE/Xcode/SU2_SOL.xcodeproj/project.xcworkspace/xcuserdata/fpalacios.xcuserdatad/UserInterfaceState.xcuserstate index c5cac24a650db697300e725c770ca9e724bb5d56..8e803f15f04a46f21b4c1646ba35b50c71d18bce 100644 GIT binary patch literal 97338 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 literal 95046 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 SU2_MAC.cpp file. + * \file SU2_MSH.hpp + * \brief Headers of the main subroutines of the code SU2_MSH. + * The subroutines and functions are in the SU2_MSH.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_MSH/obj/Makefile.am b/SU2_MSH/obj/Makefile.am new file mode 100644 index 00000000000..7f224a1a26e --- /dev/null +++ b/SU2_MSH/obj/Makefile.am @@ -0,0 +1,40 @@ +# SU2 Makefile.am for MAC +# Stanford University Aerospace Design Lab +# +# Created: 10/26/12 +# Last updated: 3/12/13 +# +# Created by: M. Colonno +# Updated by: M. Colonno +# +########################## + +# AUTOMAKE_OPTIONS = subdir-objects +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +bin_PROGRAMS = ../bin/SU2_MSH + +___bin_SU2_MSH_SOURCES = ../include/SU2_MSH.hpp \ + ../src/SU2_MSH.cpp + +___bin_SU2_MSH_CXXFLAGS = +___bin_SU2_MSH_LDADD = ../../Common/lib/libSU2.a + +# always link to built dependencies from ./externals +___bin_SU2_MSH_CXXFLAGS += @su2_externals_INCLUDES@ +___bin_SU2_MSH_LDADD += @su2_externals_LIBS@ + +# if BUILD_CGNS +___bin_SU2_MSH_CXXFLAGS += @CGNS_CXX@ +___bin_SU2_MSH_LDADD += @CGNS_LD@ +# endif + +# if BUILD_MUTATIONPP +___bin_SU2_MSH_CXXFLAGS += @MUTATIONPP_CXX@ +___bin_SU2_MSH_LDADD += @MUTATIONPP_LD@ +# endif + +# if BUILD_JSONCPP +___bin_SU2_MSH_CXXFLAGS += @JSONCPP_CXX@ +___bin_SU2_MSH_LDADD += @JSONCPP_LD@ +# endif diff --git a/SU2_DDC/obj/Makefile.in b/SU2_MSH/obj/Makefile.in similarity index 88% rename from SU2_DDC/obj/Makefile.in rename to SU2_MSH/obj/Makefile.in index dfc54083045..8f2d9ffc60a 100644 --- a/SU2_DDC/obj/Makefile.in +++ b/SU2_MSH/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for DDC +# SU2 Makefile.am for MAC # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -62,8 +62,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_DDC$(EXEEXT) -subdir = SU2_DDC/obj +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 @@ -78,10 +78,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_DDC_OBJECTS = ../src/___bin_SU2_DDC-SU2_DDC.$(OBJEXT) -___bin_SU2_DDC_OBJECTS = $(am____bin_SU2_DDC_OBJECTS) -___bin_SU2_DDC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_DDC_LINK = $(CXXLD) $(___bin_SU2_DDC_CXXFLAGS) $(CXXFLAGS) \ +am____bin_SU2_MSH_OBJECTS = ../src/___bin_SU2_MSH-SU2_MSH.$(OBJEXT) +___bin_SU2_MSH_OBJECTS = $(am____bin_SU2_MSH_OBJECTS) +___bin_SU2_MSH_DEPENDENCIES = ../../Common/lib/libSU2.a +___bin_SU2_MSH_LINK = $(CXXLD) $(___bin_SU2_MSH_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,8 +128,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(___bin_SU2_DDC_SOURCES) -DIST_SOURCES = $(___bin_SU2_DDC_SOURCES) +SOURCES = $(___bin_SU2_MSH_SOURCES) +DIST_SOURCES = $(___bin_SU2_MSH_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -258,8 +258,8 @@ top_srcdir = @top_srcdir@ # AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_DDC_SOURCES = ../include/SU2_DDC.hpp \ - ../src/SU2_DDC.cpp +___bin_SU2_MSH_SOURCES = ../include/SU2_MSH.hpp \ + ../src/SU2_MSH.cpp # always link to built dependencies from ./externals @@ -271,9 +271,9 @@ ___bin_SU2_DDC_SOURCES = ../include/SU2_DDC.hpp \ # endif # if BUILD_JSONCPP -___bin_SU2_DDC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ +___bin_SU2_MSH_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_DDC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ +___bin_SU2_MSH_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) all: all-am @@ -288,9 +288,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_DDC/obj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_MSH/obj/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_DDC/obj/Makefile + $(AUTOMAKE) --foreign SU2_MSH/obj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -355,14 +355,14 @@ clean-binPROGRAMS: ../src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ../src/$(DEPDIR) @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_DDC-SU2_DDC.$(OBJEXT): ../src/$(am__dirstamp) \ +../src/___bin_SU2_MSH-SU2_MSH.$(OBJEXT): ../src/$(am__dirstamp) \ ../src/$(DEPDIR)/$(am__dirstamp) ../bin/$(am__dirstamp): @$(MKDIR_P) ../bin @: > ../bin/$(am__dirstamp) -../bin/SU2_DDC$(EXEEXT): $(___bin_SU2_DDC_OBJECTS) $(___bin_SU2_DDC_DEPENDENCIES) $(EXTRA____bin_SU2_DDC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_DDC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_DDC_LINK) $(___bin_SU2_DDC_OBJECTS) $(___bin_SU2_DDC_LDADD) $(LIBS) +../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) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -371,7 +371,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -389,19 +389,19 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -../src/___bin_SU2_DDC-SU2_DDC.o: ../src/SU2_DDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DDC-SU2_DDC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Tpo -c -o ../src/___bin_SU2_DDC-SU2_DDC.o `test -f '../src/SU2_DDC.cpp' || echo '$(srcdir)/'`../src/SU2_DDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Tpo ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DDC.cpp' object='../src/___bin_SU2_DDC-SU2_DDC.o' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_MSH-SU2_MSH.o: ../src/SU2_MSH.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MSH_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MSH-SU2_MSH.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Tpo -c -o ../src/___bin_SU2_MSH-SU2_MSH.o `test -f '../src/SU2_MSH.cpp' || echo '$(srcdir)/'`../src/SU2_MSH.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Tpo ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MSH.cpp' object='../src/___bin_SU2_MSH-SU2_MSH.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_DDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DDC-SU2_DDC.o `test -f '../src/SU2_DDC.cpp' || echo '$(srcdir)/'`../src/SU2_DDC.cpp +@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.o `test -f '../src/SU2_MSH.cpp' || echo '$(srcdir)/'`../src/SU2_MSH.cpp -../src/___bin_SU2_DDC-SU2_DDC.obj: ../src/SU2_DDC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_DDC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_DDC-SU2_DDC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Tpo -c -o ../src/___bin_SU2_DDC-SU2_DDC.obj `if test -f '../src/SU2_DDC.cpp'; then $(CYGPATH_W) '../src/SU2_DDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_DDC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Tpo ../src/$(DEPDIR)/___bin_SU2_DDC-SU2_DDC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_DDC.cpp' object='../src/___bin_SU2_DDC-SU2_DDC.obj' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_MSH-SU2_MSH.obj: ../src/SU2_MSH.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_MSH_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_MSH-SU2_MSH.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Tpo -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` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Tpo ../src/$(DEPDIR)/___bin_SU2_MSH-SU2_MSH.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_MSH.cpp' object='../src/___bin_SU2_MSH-SU2_MSH.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_DDC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_DDC-SU2_DDC.obj `if test -f '../src/SU2_DDC.cpp'; then $(CYGPATH_W) '../src/SU2_DDC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_DDC.cpp'; fi` +@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)'; \ diff --git a/SU2_MAC/src/SU2_MAC.cpp b/SU2_MSH/src/SU2_MSH.cpp similarity index 69% rename from SU2_MAC/src/SU2_MAC.cpp rename to SU2_MSH/src/SU2_MSH.cpp index 6417f86a055..0e63e1b8f95 100644 --- a/SU2_MAC/src/SU2_MAC.cpp +++ b/SU2_MSH/src/SU2_MSH.cpp @@ -1,8 +1,8 @@ /*! - * \file SU2_MAC.cpp - * \brief Main file of Mesh Adaptation Code (SU2_MAC). + * \file SU2_MSH.cpp + * \brief Main file of Mesh Adaptation Code (SU2_MSH). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -20,7 +20,93 @@ * License along with SU2. If not, see . */ -#include "../include/SU2_MAC.hpp" + + + +//#include "../include/SU2_MSH.hpp" +//using namespace std; +// +//int main(int argc, char *argv[]) { +// +// char buffer_plt[100]; +// string MeshFile; +// unsigned short nZone = 1; +// +//#ifdef HAVE_MPI +// MPI_Init(&argc,&argv); +//#endif +// +// /*--- Definition of the class for the definition of the problem ---*/ +// CConfig *config; +// if (argc == 2) config = new CConfig(argv[1], SU2_MSH, ZONE_0, nZone, 0, VERB_HIGH); +// else { +// char grid_file[200]; +// strcpy (grid_file, "default.cfg"); +// config = new CConfig(grid_file, SU2_MSH, ZONE_0, nZone, 0, VERB_HIGH); +// } +// +// /*--- Definition of the class for the geometry ---*/ +// CGeometry *geometry; geometry = new CGeometry; +// geometry = new CPhysicalGeometry(config, ZONE_0, nZone); +// +// /*--- Perform the non-dimensionalization, in case any values are needed ---*/ +// config->SetNondimensionalization(geometry->GetnDim(), ZONE_0); +// +// cout << endl <<"----------------------- Preprocessing computations ----------------------" << endl; +// +// /*--- Compute elements surrounding points, points surrounding points, and elements surrounding elements ---*/ +// cout << "Setting local point and element connectivity." <SetEsuP(); geometry->SetPsuP(); geometry->SetEsuE(); +// +// /*--- Check the orientation before computing geometrical quantities ---*/ +// cout << "Checking the numerical grid orientation." <SetBoundVolume(); geometry->Check_Orientation(config); +// +// /*--- Create the edge structure ---*/ +// cout << "Identifying edges and vertices." <SetEdges(); geometry->SetVertex(config); +// +// /*--- Compute center of gravity ---*/ +// cout << "Computing centers of gravity." << endl; +// geometry->SetCG(); +// +// /*--- Create the control volume structures ---*/ +// cout << "Setting the control volume structure." << endl; +// geometry->SetControlVolume(config, ALLOCATE); +// geometry->SetBoundControlVolume(config, ALLOCATE); +// +// cout << endl <<"-------------------- Setting the periodic boundaries --------------------" << endl; +// +// /*--- Set periodic boundary conditions ---*/ +// geometry->SetPeriodicBoundary(config); +// +// /*--- Original grid for debugging purposes ---*/ +// strcpy (buffer_plt, "periodic_original.plt"); geometry->SetTecPlot(buffer_plt); +// +// /*--- Create a new grid with the right periodic boundary ---*/ +// CGeometry *periodic; periodic = new CPeriodicGeometry(geometry, config); +// periodic->SetPeriodicBoundary(geometry, config); +// periodic->SetMeshFile(geometry, config, config->GetMesh_Out_FileName()); +// +// /*--- Output of the grid for debuging purposes ---*/ +// strcpy (buffer_plt, "periodic_halo.plt"); periodic->SetTecPlot(buffer_plt); +// +//#ifdef HAVE_MPI +// MPI_Finalize(); +//#endif +// +// /*--- End solver ---*/ +// cout << endl <<"------------------------- Exit Success (SU2_MSH) ------------------------" << endl << endl; +// +// return EXIT_SUCCESS; +//} + + + + + + +#include "../include/SU2_MSH.hpp" using namespace std; int main(int argc, char *argv[]) { @@ -35,8 +121,8 @@ int main(int argc, char *argv[]) { /*--- Definition of the config problem ---*/ CConfig *config; - if (argc == 2) config = new CConfig(argv[1], SU2_MAC, ZONE_0, nZone, 0, VERB_HIGH); - else { strcpy (file_name, "default.cfg"); config = new CConfig(file_name, SU2_MAC, ZONE_0, nZone, 0, VERB_HIGH); } + if (argc == 2) config = new CConfig(argv[1], SU2_MSH, ZONE_0, nZone, 0, VERB_HIGH); + else { strcpy (file_name, "default.cfg"); config = new CConfig(file_name, SU2_MSH, ZONE_0, nZone, 0, VERB_HIGH); } /*--- Definition of the Class for the geometry ---*/ CGeometry *geometry; geometry = new CGeometry; @@ -207,7 +293,7 @@ int main(int argc, char *argv[]) { #endif /*--- End solver ---*/ - cout << endl <<"------------------------- Exit Success (SU2_MAC) ------------------------" << endl << endl; + cout << endl <<"------------------------- Exit Success (SU2_MSH) ------------------------" << endl << endl; return EXIT_SUCCESS; } diff --git a/SU2_PBC/bin/.gitignore b/SU2_PBC/bin/.gitignore deleted file mode 100644 index fe891329eff..00000000000 --- a/SU2_PBC/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Do not track compiled execuatables -SU2* diff --git a/SU2_PBC/include/SU2_PBC.hpp b/SU2_PBC/include/SU2_PBC.hpp deleted file mode 100644 index d9328e30f7b..00000000000 --- a/SU2_PBC/include/SU2_PBC.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/*! - * \file SU2_PBC.hpp - * \brief Headers of the main subroutines of the code SU2_PBC. - * The subroutines and functions are in the SU2_PBC.cpp file. - * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" - * - * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). - * - * 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 . - */ - -#pragma once - -#include "../../Common/include/geometry_structure.hpp" -#include "../../Common/include/config_structure.hpp" -#include -#include -#include -#include - -using namespace std; diff --git a/SU2_PBC/obj/Makefile.am b/SU2_PBC/obj/Makefile.am deleted file mode 100644 index f23b1f55533..00000000000 --- a/SU2_PBC/obj/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# SU^2 Makefile.am for PBC -# Stanford University Aerospace Design Lab -# -# Created: 10/26/12 -# Last updated: 3/12/13 -# -# Created by: M. Colonno -# Updated by: M. Colonno -# -########################## - -# AUTOMAKE_OPTIONS = subdir-objects -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} - -bin_PROGRAMS = ../bin/SU2_PBC - -___bin_SU2_PBC_SOURCES = ../include/SU2_PBC.hpp \ - ../src/SU2_PBC.cpp - -___bin_SU2_PBC_CXXFLAGS = -___bin_SU2_PBC_LDADD = ../../Common/lib/libSU2.a - -# always link to built dependencies from ./externals -___bin_SU2_PBC_CXXFLAGS += @su2_externals_INCLUDES@ -___bin_SU2_PBC_LDADD += @su2_externals_LIBS@ - -# if BUILD_CGNS -___bin_SU2_PBC_CXXFLAGS += @CGNS_CXX@ -___bin_SU2_PBC_LDADD += @CGNS_LD@ -# endif - -# if BUILD_MUTATIONPP -___bin_SU2_PBC_CXXFLAGS += @MUTATIONPP_CXX@ -___bin_SU2_PBC_LDADD += @MUTATIONPP_LD@ -# endif - -# if BUILD_JSONCPP -___bin_SU2_PBC_CXXFLAGS += @JSONCPP_CXX@ -___bin_SU2_PBC_LDADD += @JSONCPP_LD@ -# endif diff --git a/SU2_PBC/obj/Makefile.in b/SU2_PBC/obj/Makefile.in deleted file mode 100644 index 254f09e4918..00000000000 --- a/SU2_PBC/obj/Makefile.in +++ /dev/null @@ -1,630 +0,0 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# SU^2 Makefile.am for PBC -# Stanford University Aerospace Design Lab -# -# Created: 10/26/12 -# Last updated: 3/12/13 -# -# Created by: M. Colonno -# Updated by: M. Colonno -# -########################## - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_PBC$(EXEEXT) -subdir = SU2_PBC/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/ax_tls.m4 \ - $(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/tecio.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_PBC_OBJECTS = ../src/___bin_SU2_PBC-SU2_PBC.$(OBJEXT) -___bin_SU2_PBC_OBJECTS = $(am____bin_SU2_PBC_OBJECTS) -___bin_SU2_PBC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_PBC_LINK = $(CXXLD) $(___bin_SU2_PBC_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(___bin_SU2_PBC_SOURCES) -DIST_SOURCES = $(___bin_SU2_PBC_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CGNS_CXX = @CGNS_CXX@ -CGNS_LD = @CGNS_LD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JSONCPP_CXX = @JSONCPP_CXX@ -JSONCPP_LD = @JSONCPP_LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -METIS_INCLUDE = @METIS_INCLUDE@ -METIS_LIB = @METIS_LIB@ -MKDIR_P = @MKDIR_P@ -MUTATIONPP_CXX = @MUTATIONPP_CXX@ -MUTATIONPP_LD = @MUTATIONPP_LD@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SU2_METIS_CPPFLAGS = @SU2_METIS_CPPFLAGS@ -TECIO_CPPFLAGS = @TECIO_CPPFLAGS@ -TECIO_INCLUDE = @TECIO_INCLUDE@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -su2_externals_INCLUDES = @su2_externals_INCLUDES@ -su2_externals_LIBS = @su2_externals_LIBS@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# AUTOMAKE_OPTIONS = subdir-objects -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_PBC_SOURCES = ../include/SU2_PBC.hpp \ - ../src/SU2_PBC.cpp - - -# always link to built dependencies from ./externals - -# if BUILD_CGNS -# endif - -# if BUILD_MUTATIONPP -# endif - -# if BUILD_JSONCPP -___bin_SU2_PBC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ - @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_PBC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ - @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_PBC/obj/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_PBC/obj/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - 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; \ - done | \ - 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 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @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)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -../src/$(am__dirstamp): - @$(MKDIR_P) ../src - @: > ../src/$(am__dirstamp) -../src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) ../src/$(DEPDIR) - @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_PBC-SU2_PBC.$(OBJEXT): ../src/$(am__dirstamp) \ - ../src/$(DEPDIR)/$(am__dirstamp) -../bin/$(am__dirstamp): - @$(MKDIR_P) ../bin - @: > ../bin/$(am__dirstamp) -../bin/SU2_PBC$(EXEEXT): $(___bin_SU2_PBC_OBJECTS) $(___bin_SU2_PBC_DEPENDENCIES) $(EXTRA____bin_SU2_PBC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_PBC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_PBC_LINK) $(___bin_SU2_PBC_OBJECTS) $(___bin_SU2_PBC_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f ../src/*.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -../src/___bin_SU2_PBC-SU2_PBC.o: ../src/SU2_PBC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PBC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_PBC-SU2_PBC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Tpo -c -o ../src/___bin_SU2_PBC-SU2_PBC.o `test -f '../src/SU2_PBC.cpp' || echo '$(srcdir)/'`../src/SU2_PBC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Tpo ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_PBC.cpp' object='../src/___bin_SU2_PBC-SU2_PBC.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_PBC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_PBC-SU2_PBC.o `test -f '../src/SU2_PBC.cpp' || echo '$(srcdir)/'`../src/SU2_PBC.cpp - -../src/___bin_SU2_PBC-SU2_PBC.obj: ../src/SU2_PBC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PBC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_PBC-SU2_PBC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Tpo -c -o ../src/___bin_SU2_PBC-SU2_PBC.obj `if test -f '../src/SU2_PBC.cpp'; then $(CYGPATH_W) '../src/SU2_PBC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_PBC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Tpo ../src/$(DEPDIR)/___bin_SU2_PBC-SU2_PBC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_PBC.cpp' object='../src/___bin_SU2_PBC-SU2_PBC.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_PBC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_PBC-SU2_PBC.obj `if test -f '../src/SU2_PBC.cpp'; then $(CYGPATH_W) '../src/SU2_PBC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_PBC.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) - 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; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f ../bin/$(am__dirstamp) - -rm -f ../src/$(DEPDIR)/$(am__dirstamp) - -rm -f ../src/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-am - -rm -rf ../src/$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ../src/$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -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 - -# endif - -# 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. -.NOEXPORT: diff --git a/SU2_PBC/src/SU2_PBC.cpp b/SU2_PBC/src/SU2_PBC.cpp deleted file mode 100644 index 1e47d204081..00000000000 --- a/SU2_PBC/src/SU2_PBC.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/*! - * \file SU2_PBC.cpp - * \brief Main file of Periodic Boundary Code (SU2_PBC). - * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" - * - * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). - * - * 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 . - */ - -#include "../include/SU2_PBC.hpp" -using namespace std; - -int main(int argc, char *argv[]) { - - char buffer_plt[100]; - string MeshFile; - unsigned short nZone = 1; - -#ifdef HAVE_MPI - MPI_Init(&argc,&argv); -#endif - - /*--- Definition of the class for the definition of the problem ---*/ - CConfig *config; - if (argc == 2) config = new CConfig(argv[1], SU2_PBC, ZONE_0, nZone, 0, VERB_HIGH); - else { - char grid_file[200]; - strcpy (grid_file, "default.cfg"); - config = new CConfig(grid_file, SU2_PBC, ZONE_0, nZone, 0, VERB_HIGH); - } - - /*--- Definition of the class for the geometry ---*/ - CGeometry *geometry; geometry = new CGeometry; - geometry = new CPhysicalGeometry(config, ZONE_0, nZone); - - /*--- Perform the non-dimensionalization, in case any values are needed ---*/ - config->SetNondimensionalization(geometry->GetnDim(), ZONE_0); - - cout << endl <<"----------------------- Preprocessing computations ----------------------" << endl; - - /*--- Compute elements surrounding points, points surrounding points, and elements surrounding elements ---*/ - cout << "Setting local point and element connectivity." <SetEsuP(); geometry->SetPsuP(); geometry->SetEsuE(); - - /*--- Check the orientation before computing geometrical quantities ---*/ - cout << "Checking the numerical grid orientation." <SetBoundVolume(); geometry->Check_Orientation(config); - - /*--- Create the edge structure ---*/ - cout << "Identifying edges and vertices." <SetEdges(); geometry->SetVertex(config); - - /*--- Compute center of gravity ---*/ - cout << "Computing centers of gravity." << endl; - geometry->SetCG(); - - /*--- Create the control volume structures ---*/ - cout << "Setting the control volume structure." << endl; - geometry->SetControlVolume(config, ALLOCATE); - geometry->SetBoundControlVolume(config, ALLOCATE); - - cout << endl <<"-------------------- Setting the periodic boundaries --------------------" << endl; - - /*--- Set periodic boundary conditions ---*/ - geometry->SetPeriodicBoundary(config); - - /*--- Original grid for debugging purposes ---*/ - strcpy (buffer_plt, "periodic_original.plt"); geometry->SetTecPlot(buffer_plt); - - /*--- Create a new grid with the right periodic boundary ---*/ - CGeometry *periodic; periodic = new CPeriodicGeometry(geometry, config); - periodic->SetPeriodicBoundary(geometry, config); - periodic->SetMeshFile(geometry, config, config->GetMesh_Out_FileName()); - - /*--- Output of the grid for debuging purposes ---*/ - strcpy (buffer_plt, "periodic_halo.plt"); periodic->SetTecPlot(buffer_plt); - -#ifdef HAVE_MPI - MPI_Finalize(); -#endif - - /*--- End solver ---*/ - cout << endl <<"------------------------- Exit Success (SU2_PBC) ------------------------" << endl << endl; - - return EXIT_SUCCESS; -} diff --git a/SU2_MDC/bin/.gitignore b/SU2_PRT/bin/.gitignore similarity index 100% rename from SU2_MDC/bin/.gitignore rename to SU2_PRT/bin/.gitignore diff --git a/SU2_MDC/include/SU2_MDC.hpp b/SU2_PRT/include/SU2_PRT.hpp similarity index 84% rename from SU2_MDC/include/SU2_MDC.hpp rename to SU2_PRT/include/SU2_PRT.hpp index a5466223d19..3d10574e52f 100644 --- a/SU2_MDC/include/SU2_MDC.hpp +++ b/SU2_PRT/include/SU2_PRT.hpp @@ -1,9 +1,9 @@ /*! - * \file SU2_MDC.hpp - * \brief Headers of the main subroutines of the code SU2_MDC. - * The subroutines and functions are in the SU2_MDC.cpp file. + * \file SU2_PRT.hpp + * \brief Headers of the main subroutines of the code SU2_PRT. + * The subroutines and functions are in the SU2_PRT.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_PRT/obj/Makefile.am b/SU2_PRT/obj/Makefile.am new file mode 100644 index 00000000000..0385b346767 --- /dev/null +++ b/SU2_PRT/obj/Makefile.am @@ -0,0 +1,40 @@ +# SU2 Makefile.am for PRT +# Stanford University Aerospace Design Lab +# +# Created: 10/26/12 +# Last updated: 3/12/13 +# +# Created by: M. Colonno +# Updated by: M. Colonno +# +########################## + +# AUTOMAKE_OPTIONS = subdir-objects +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} + +bin_PROGRAMS = ../bin/SU2_PRT + +___bin_SU2_PRT_SOURCES = ../include/SU2_PRT.hpp \ + ../src/SU2_PRT.cpp + +___bin_SU2_PRT_CXXFLAGS = +___bin_SU2_PRT_LDADD = ../../Common/lib/libSU2.a + +# always link to built dependencies from ./externals +___bin_SU2_PRT_CXXFLAGS += @su2_externals_INCLUDES@ +___bin_SU2_PRT_LDADD += @su2_externals_LIBS@ + +# if BUILD_CGNS +___bin_SU2_PRT_CXXFLAGS += @CGNS_CXX@ +___bin_SU2_PRT_LDADD += @CGNS_LD@ +# endif + +# if BUILD_MUTATIONPP +___bin_SU2_PRT_CXXFLAGS += @MUTATIONPP_CXX@ +___bin_SU2_PRT_LDADD += @MUTATIONPP_LD@ +# endif + +# if BUILD_JSONCPP +___bin_SU2_PRT_CXXFLAGS += @JSONCPP_CXX@ +___bin_SU2_PRT_LDADD += @JSONCPP_LD@ +# endif diff --git a/SU2_GPC/obj/Makefile.in b/SU2_PRT/obj/Makefile.in similarity index 88% rename from SU2_GPC/obj/Makefile.in rename to SU2_PRT/obj/Makefile.in index 8ce0db08f41..bd7ca7dd55d 100644 --- a/SU2_GPC/obj/Makefile.in +++ b/SU2_PRT/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for GPC +# SU2 Makefile.am for PRT # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -62,8 +62,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_GPC$(EXEEXT) -subdir = SU2_GPC/obj +bin_PROGRAMS = ../bin/SU2_PRT$(EXEEXT) +subdir = SU2_PRT/obj DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -78,10 +78,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_GPC_OBJECTS = ../src/___bin_SU2_GPC-SU2_GPC.$(OBJEXT) -___bin_SU2_GPC_OBJECTS = $(am____bin_SU2_GPC_OBJECTS) -___bin_SU2_GPC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_GPC_LINK = $(CXXLD) $(___bin_SU2_GPC_CXXFLAGS) $(CXXFLAGS) \ +am____bin_SU2_PRT_OBJECTS = ../src/___bin_SU2_PRT-SU2_PRT.$(OBJEXT) +___bin_SU2_PRT_OBJECTS = $(am____bin_SU2_PRT_OBJECTS) +___bin_SU2_PRT_DEPENDENCIES = ../../Common/lib/libSU2.a +___bin_SU2_PRT_LINK = $(CXXLD) $(___bin_SU2_PRT_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,8 +128,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(___bin_SU2_GPC_SOURCES) -DIST_SOURCES = $(___bin_SU2_GPC_SOURCES) +SOURCES = $(___bin_SU2_PRT_SOURCES) +DIST_SOURCES = $(___bin_SU2_PRT_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -258,8 +258,8 @@ top_srcdir = @top_srcdir@ # AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_GPC_SOURCES = ../include/SU2_GPC.hpp \ - ../src/SU2_GPC.cpp +___bin_SU2_PRT_SOURCES = ../include/SU2_PRT.hpp \ + ../src/SU2_PRT.cpp # always link to built dependencies from ./externals @@ -271,9 +271,9 @@ ___bin_SU2_GPC_SOURCES = ../include/SU2_GPC.hpp \ # endif # if BUILD_JSONCPP -___bin_SU2_GPC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ +___bin_SU2_PRT_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_GPC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ +___bin_SU2_PRT_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) all: all-am @@ -288,9 +288,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_GPC/obj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_PRT/obj/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_GPC/obj/Makefile + $(AUTOMAKE) --foreign SU2_PRT/obj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -355,14 +355,14 @@ clean-binPROGRAMS: ../src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ../src/$(DEPDIR) @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_GPC-SU2_GPC.$(OBJEXT): ../src/$(am__dirstamp) \ +../src/___bin_SU2_PRT-SU2_PRT.$(OBJEXT): ../src/$(am__dirstamp) \ ../src/$(DEPDIR)/$(am__dirstamp) ../bin/$(am__dirstamp): @$(MKDIR_P) ../bin @: > ../bin/$(am__dirstamp) -../bin/SU2_GPC$(EXEEXT): $(___bin_SU2_GPC_OBJECTS) $(___bin_SU2_GPC_DEPENDENCIES) $(EXTRA____bin_SU2_GPC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_GPC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_GPC_LINK) $(___bin_SU2_GPC_OBJECTS) $(___bin_SU2_GPC_LDADD) $(LIBS) +../bin/SU2_PRT$(EXEEXT): $(___bin_SU2_PRT_OBJECTS) $(___bin_SU2_PRT_DEPENDENCIES) $(EXTRA____bin_SU2_PRT_DEPENDENCIES) ../bin/$(am__dirstamp) + @rm -f ../bin/SU2_PRT$(EXEEXT) + $(AM_V_CXXLD)$(___bin_SU2_PRT_LINK) $(___bin_SU2_PRT_OBJECTS) $(___bin_SU2_PRT_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -371,7 +371,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -389,19 +389,19 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -../src/___bin_SU2_GPC-SU2_GPC.o: ../src/SU2_GPC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GPC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GPC-SU2_GPC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Tpo -c -o ../src/___bin_SU2_GPC-SU2_GPC.o `test -f '../src/SU2_GPC.cpp' || echo '$(srcdir)/'`../src/SU2_GPC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Tpo ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GPC.cpp' object='../src/___bin_SU2_GPC-SU2_GPC.o' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_PRT-SU2_PRT.o: ../src/SU2_PRT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PRT_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_PRT-SU2_PRT.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Tpo -c -o ../src/___bin_SU2_PRT-SU2_PRT.o `test -f '../src/SU2_PRT.cpp' || echo '$(srcdir)/'`../src/SU2_PRT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Tpo ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_PRT.cpp' object='../src/___bin_SU2_PRT-SU2_PRT.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_GPC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_GPC-SU2_GPC.o `test -f '../src/SU2_GPC.cpp' || echo '$(srcdir)/'`../src/SU2_GPC.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PRT_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_PRT-SU2_PRT.o `test -f '../src/SU2_PRT.cpp' || echo '$(srcdir)/'`../src/SU2_PRT.cpp -../src/___bin_SU2_GPC-SU2_GPC.obj: ../src/SU2_GPC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_GPC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_GPC-SU2_GPC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Tpo -c -o ../src/___bin_SU2_GPC-SU2_GPC.obj `if test -f '../src/SU2_GPC.cpp'; then $(CYGPATH_W) '../src/SU2_GPC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_GPC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Tpo ../src/$(DEPDIR)/___bin_SU2_GPC-SU2_GPC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_GPC.cpp' object='../src/___bin_SU2_GPC-SU2_GPC.obj' libtool=no @AMDEPBACKSLASH@ +../src/___bin_SU2_PRT-SU2_PRT.obj: ../src/SU2_PRT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PRT_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_PRT-SU2_PRT.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Tpo -c -o ../src/___bin_SU2_PRT-SU2_PRT.obj `if test -f '../src/SU2_PRT.cpp'; then $(CYGPATH_W) '../src/SU2_PRT.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_PRT.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Tpo ../src/$(DEPDIR)/___bin_SU2_PRT-SU2_PRT.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_PRT.cpp' object='../src/___bin_SU2_PRT-SU2_PRT.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_GPC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_GPC-SU2_GPC.obj `if test -f '../src/SU2_GPC.cpp'; then $(CYGPATH_W) '../src/SU2_GPC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_GPC.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_PRT_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_PRT-SU2_PRT.obj `if test -f '../src/SU2_PRT.cpp'; then $(CYGPATH_W) '../src/SU2_PRT.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_PRT.cpp'; fi` ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/SU2_DDC/src/SU2_DDC.cpp b/SU2_PRT/src/SU2_PRT.cpp similarity index 91% rename from SU2_DDC/src/SU2_DDC.cpp rename to SU2_PRT/src/SU2_PRT.cpp index 8a7eb60cd3f..2f1249a5ca4 100644 --- a/SU2_DDC/src/SU2_DDC.cpp +++ b/SU2_PRT/src/SU2_PRT.cpp @@ -1,8 +1,8 @@ /*! - * \file SU2_DDC.cpp - * \brief Main file of Domain Decomposition Code (SU2_DDC). + * \file SU2_PRT.cpp + * \brief Main file of Domain Decomposition Code (SU2_PRT). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * @@ -20,7 +20,7 @@ * License along with SU2. If not, see . */ -#include "../include/SU2_DDC.hpp" +#include "../include/SU2_PRT.hpp" using namespace std; int main(int argc, char *argv[]) { @@ -47,8 +47,8 @@ int main(int argc, char *argv[]) { CFreeFormDefBox** FFDBox = NULL; /*--- Definition of the config problem ---*/ - if (argc == 2) { config = new CConfig(argv[1], SU2_DDC, ZONE_0, nZone, 0, VERB_HIGH); } - else { strcpy (file_name, "default.cfg"); config = new CConfig(file_name, SU2_DDC, ZONE_0, nZone, 0, VERB_HIGH); } + if (argc == 2) { config = new CConfig(argv[1], SU2_PRT, ZONE_0, nZone, 0, VERB_HIGH); } + else { strcpy (file_name, "default.cfg"); config = new CConfig(file_name, SU2_PRT, ZONE_0, nZone, 0, VERB_HIGH); } if (rank == MASTER_NODE) { @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) { /*--- End solver ---*/ if (rank == MASTER_NODE) - cout << endl <<"------------------------- Exit Success (SU2_DDC) ------------------------" << endl << endl; + cout << endl <<"------------------------- Exit Success (SU2_PRT) ------------------------" << endl << endl; #ifdef HAVE_MPI diff --git a/SU2_PY/2DChannel.py b/SU2_PY/2DChannel.py index 4dcf174dbe8..21822c4be1c 100644 --- a/SU2_PY/2DChannel.py +++ b/SU2_PY/2DChannel.py @@ -3,7 +3,7 @@ ## \file 2DChannel.py # \brief Python script for creating grid for freesurface channels. # \author F. Palacios -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/3DChannel.py b/SU2_PY/3DChannel.py index e5584b25fe2..9761c65fd32 100644 --- a/SU2_PY/3DChannel.py +++ b/SU2_PY/3DChannel.py @@ -3,7 +3,7 @@ ## \file 3DChannel.py # \brief Python script for box meshing # \author F. Palacios -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/Makefile.am b/SU2_PY/Makefile.am index 8b140f46a68..815d18c10ae 100644 --- a/SU2_PY/Makefile.am +++ b/SU2_PY/Makefile.am @@ -1,4 +1,4 @@ -# SU^2 Makefile.am for Python scripts +# SU2 Makefile.am for Python scripts # Stanford University Aerospace Design Lab # # Created: 4/4/2013 diff --git a/SU2_PY/Makefile.in b/SU2_PY/Makefile.in index 637c20726c7..5cad592dd57 100644 --- a/SU2_PY/Makefile.in +++ b/SU2_PY/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for Python scripts +# SU2 Makefile.am for Python scripts # Stanford University Aerospace Design Lab # # Created: 4/4/2013 diff --git a/SU2_PY/SU2/eval/design.py b/SU2_PY/SU2/eval/design.py index ac4030850fa..783cfd476d5 100644 --- a/SU2_PY/SU2/eval/design.py +++ b/SU2_PY/SU2/eval/design.py @@ -1,7 +1,7 @@ ## \file design.py # \brief python package for designs # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/eval/functions.py b/SU2_PY/SU2/eval/functions.py index 134da607cdf..37bee13cd69 100644 --- a/SU2_PY/SU2/eval/functions.py +++ b/SU2_PY/SU2/eval/functions.py @@ -1,7 +1,7 @@ ## \file functions.py # \brief python package for functions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/eval/gradients.py b/SU2_PY/SU2/eval/gradients.py index 874decb5fef..cf27d6b0247 100644 --- a/SU2_PY/SU2/eval/gradients.py +++ b/SU2_PY/SU2/eval/gradients.py @@ -1,7 +1,7 @@ ## \file gradients.py # \brief python package for gradients # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py index f11484b502b..eff09269213 100644 --- a/SU2_PY/SU2/io/config.py +++ b/SU2_PY/SU2/io/config.py @@ -1,7 +1,7 @@ ## \file config.py # \brief python package for config # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/data.py b/SU2_PY/SU2/io/data.py index cb20eaacdaf..b16edcb4b02 100644 --- a/SU2_PY/SU2/io/data.py +++ b/SU2_PY/SU2/io/data.py @@ -1,7 +1,7 @@ ## \file data.py # \brief python package for data utility functions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/filelock.py b/SU2_PY/SU2/io/filelock.py index ccd703955ea..25a54453e88 100644 --- a/SU2_PY/SU2/io/filelock.py +++ b/SU2_PY/SU2/io/filelock.py @@ -1,7 +1,7 @@ ## \file filelock.py # \brief python package for filelocking # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/redirect.py b/SU2_PY/SU2/io/redirect.py index c144abe47c9..01b0d9dd3ab 100644 --- a/SU2_PY/SU2/io/redirect.py +++ b/SU2_PY/SU2/io/redirect.py @@ -1,7 +1,7 @@ ## \file redirect.py # \brief python package for file redirection # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/state.py b/SU2_PY/SU2/io/state.py index fc51b630bcb..f7c2843083f 100644 --- a/SU2_PY/SU2/io/state.py +++ b/SU2_PY/SU2/io/state.py @@ -1,7 +1,7 @@ ## \file state.py # \brief python package for state # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py index 525ff451d19..12806e676e0 100644 --- a/SU2_PY/SU2/io/tools.py +++ b/SU2_PY/SU2/io/tools.py @@ -3,7 +3,7 @@ ## \file tools.py # \brief file i/o functions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory @@ -30,7 +30,7 @@ from SU2.util import ordered_bunch # ------------------------------------------------------------------- -# Read SU2_GPC Gradient Values +# Read SU2_DOT Gradient Values # ------------------------------------------------------------------- def read_gradients( Grad_filename , scale = 1.0): diff --git a/SU2_PY/SU2/mesh/adapt.py b/SU2_PY/SU2/mesh/adapt.py index e62e632127a..a609c159a2f 100644 --- a/SU2_PY/SU2/mesh/adapt.py +++ b/SU2_PY/SU2/mesh/adapt.py @@ -4,7 +4,7 @@ from .. import io as su2io from ..run import decompose as su2decomp from ..run import CFD as SU2_CFD -from ..run import MAC as SU2_MAC +from ..run import MSH as SU2_MSH def full(config): config = copy.deepcopy(config) @@ -25,8 +25,8 @@ def full_flow(config): # set config konfig.KIND_ADAPT = 'FULL_FLOW' - # run MAC - SU2_MAC(konfig) + # run MSH + SU2_MSH(konfig) return diff --git a/SU2_PY/SU2/mesh/tools.py b/SU2_PY/SU2/mesh/tools.py index a8f83de65ac..a49dd79e24b 100644 --- a/SU2_PY/SU2/mesh/tools.py +++ b/SU2_PY/SU2/mesh/tools.py @@ -3,7 +3,7 @@ ## \file tools.py # \brief mesh functions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/opt/project.py b/SU2_PY/SU2/opt/project.py index 921b71a4b4f..0ac539bc235 100644 --- a/SU2_PY/SU2/opt/project.py +++ b/SU2_PY/SU2/opt/project.py @@ -3,7 +3,7 @@ ## \file project.py # \brief package for optimization projects # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/opt/scipy_tools.py b/SU2_PY/SU2/opt/scipy_tools.py index 9c7dd61b96e..d975b81475f 100644 --- a/SU2_PY/SU2/opt/scipy_tools.py +++ b/SU2_PY/SU2/opt/scipy_tools.py @@ -3,7 +3,7 @@ ## \file scipy_tools.py # \brief tools for interfacing with scipy # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/run/__init__.py b/SU2_PY/SU2/run/__init__.py index 7e4a5b80ac9..d64ac0e9cf1 100644 --- a/SU2_PY/SU2/run/__init__.py +++ b/SU2_PY/SU2/run/__init__.py @@ -3,13 +3,11 @@ from interface import \ build_command ,\ run_command ,\ - DDC ,\ + PRT ,\ CFD ,\ - MAC ,\ - MDC ,\ - GPC ,\ - SMC ,\ - PBC ,\ + MSH ,\ + DEF ,\ + DOT ,\ SOL ; from decompose import decompose diff --git a/SU2_PY/SU2/run/adjoint.py b/SU2_PY/SU2/run/adjoint.py index b94eac72a4f..6b85615a9c9 100644 --- a/SU2_PY/SU2/run/adjoint.py +++ b/SU2_PY/SU2/run/adjoint.py @@ -1,7 +1,7 @@ ## \file adjoint.py # \brief python package for running adjoint problems # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/run/decompose.py b/SU2_PY/SU2/run/decompose.py index e09baa55c0f..bbfef5bae74 100644 --- a/SU2_PY/SU2/run/decompose.py +++ b/SU2_PY/SU2/run/decompose.py @@ -1,7 +1,7 @@ ## \file decompose.py # \brief python package for decomposing meshes # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory @@ -25,7 +25,7 @@ import os, sys, shutil, copy from .. import io as su2io -from interface import DDC as SU2_DDC +from interface import PRT as SU2_PRT # ---------------------------------------------------------------------- # Decompose Mesh @@ -35,7 +35,7 @@ def decompose( config ): """ info = SU2.run.decompose(config) Decomposes mesh with: - SU2.run.DDC() + SU2.run.PRT() Assumptions: config.NUMBER_PART is set @@ -63,7 +63,7 @@ def decompose( config ): return su2io.State() # Run Decomposition - SU2_DDC(konfig) + SU2_PRT(konfig) # update config super copy config['DECOMPOSED'] = True diff --git a/SU2_PY/SU2/run/deform.py b/SU2_PY/SU2/run/deform.py index 720ce9b2430..c730c06e59c 100644 --- a/SU2_PY/SU2/run/deform.py +++ b/SU2_PY/SU2/run/deform.py @@ -1,7 +1,7 @@ ## \file deform.py # \brief python package for deforming meshes # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory @@ -27,7 +27,7 @@ from .. import io as su2io from decompose import decompose as su2decomp -from interface import MDC as SU2_MDC +from interface import DEF as SU2_DEF # ---------------------------------------------------------------------- @@ -39,7 +39,7 @@ def deform ( config, dv_new=None, dv_old=None ): Deforms mesh with: SU2.run.decomp() - SU2.run.MDC() + SU2.run.DEF() Assumptions: Redundant decomposition if config.DECOMPOSED == True @@ -90,7 +90,7 @@ def deform ( config, dv_new=None, dv_old=None ): konfig['MESH_OUT_FILENAME'] = meshname_suffixed # Run Deformation - SU2_MDC(konfig) + SU2_DEF(konfig) # update super config config.update({ 'DECOMPOSED' : konfig['DECOMPOSED'] , diff --git a/SU2_PY/SU2/run/direct.py b/SU2_PY/SU2/run/direct.py index 68e3d928820..71f550a85d2 100644 --- a/SU2_PY/SU2/run/direct.py +++ b/SU2_PY/SU2/run/direct.py @@ -1,7 +1,7 @@ ## \file direct.py # \brief python package for running direct solutions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/run/geometry.py b/SU2_PY/SU2/run/geometry.py index 4b8ba9fee9c..5fa14785679 100644 --- a/SU2_PY/SU2/run/geometry.py +++ b/SU2_PY/SU2/run/geometry.py @@ -27,7 +27,7 @@ from .. import io as su2io from decompose import decompose as su2decomp -from interface import GDC as SU2_GDC +from interface import GEO as SU2_GEO from ..util import ordered_bunch # ---------------------------------------------------------------------- @@ -39,7 +39,7 @@ def geometry ( config , step = 1e-3 ): Runs an geometry analysis with: SU2.run.decomp() - SU2.run.GDC() + SU2.run.GEO() Assumptions: Redundant decomposition if config.DECOMPOSED == True @@ -76,7 +76,7 @@ def geometry ( config , step = 1e-3 ): assert len(step) == n_DV , 'unexpected step vector length' else: step = [step]*n_DV - dv_old = [0.0]*n_DV # SU2_GPC input requirement, assumes linear superposition of design variables + dv_old = [0.0]*n_DV # SU2_DOT input requirement, assumes linear superposition of design variables dv_new = step konfig.unpack_dvs(dv_new,dv_old) @@ -84,7 +84,7 @@ def geometry ( config , step = 1e-3 ): su2decomp(konfig) # Run Solution - SU2_GDC(konfig) + SU2_GEO(konfig) # info out info = su2io.State() diff --git a/SU2_PY/SU2/run/interface.py b/SU2_PY/SU2/run/interface.py index b26ebee0096..d1ac4c92aee 100644 --- a/SU2_PY/SU2/run/interface.py +++ b/SU2_PY/SU2/run/interface.py @@ -1,7 +1,7 @@ ## \file interface.py # \brief python package interfacing with the SU2 suite # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory @@ -55,20 +55,20 @@ # SU2 Suite Interface Functions # ------------------------------------------------------------ -def DDC(config): - """ run SU2_DDC +def PRT(config): + """ run SU2_PRT partitions set by config.NUMBER_PART currently forced to run serially """ # local copy konfig = copy.deepcopy(config) - tempname = 'config_DDC.cfg' + tempname = 'config_PRT.cfg' konfig.dump(tempname) processes = konfig['NUMBER_PART'] - the_Command = 'SU2_DDC ' + tempname + the_Command = 'SU2_PRT ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) @@ -96,21 +96,21 @@ def CFD(config): return -def MAC(config): - """ run SU2_MAC +def MSH(config): + """ run SU2_MSH partitions set by config.NUMBER_PART currently forced to run serially """ konfig = copy.deepcopy(config) - tempname = 'config_MAC.cfg' + tempname = 'config_MSH.cfg' konfig.dump(tempname) # must run with rank 1 processes = konfig['NUMBER_PART'] processes = min([1,processes]) - the_Command = 'SU2_MAC ' + tempname + the_Command = 'SU2_MSH ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) @@ -118,20 +118,20 @@ def MAC(config): return -def MDC(config): - """ run SU2_MDC +def DEF(config): + """ run SU2_DEF partitions set by config.NUMBER_PART forced to run in serial, expects merged mesh input """ konfig = copy.deepcopy(config) - tempname = 'config_MDC.cfg' + tempname = 'config_DEF.cfg' konfig.dump(tempname) # must run with rank 1 processes = konfig['NUMBER_PART'] - the_Command = 'SU2_MDC ' + tempname + the_Command = 'SU2_DEF ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) @@ -139,18 +139,18 @@ def MDC(config): return -def GPC(config): - """ run SU2_GPC +def DOT(config): + """ run SU2_DOT partitions set by config.NUMBER_PART """ konfig = copy.deepcopy(config) - tempname = 'config_GPC.cfg' + tempname = 'config_DOT.cfg' konfig.dump(tempname) processes = konfig['NUMBER_PART'] - the_Command = 'SU2_GPC ' + tempname + the_Command = 'SU2_DOT ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) @@ -158,20 +158,20 @@ def GPC(config): return -def GDC(config): - """ run SU2_GDC +def GEO(config): + """ run SU2_GEO partitions set by config.NUMBER_PART forced to run in serial """ konfig = copy.deepcopy(config) - tempname = 'config_GDC.cfg' + tempname = 'config_GEO.cfg' konfig.dump(tempname) # must run with rank 1 processes = konfig['NUMBER_PART'] - the_Command = 'SU2_GDC ' + tempname + the_Command = 'SU2_GEO ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) @@ -201,7 +201,7 @@ def SMC(config): return def PBC(config): - """ run SU2_PBC + """ run SU2_MSH partitions set by config.NUMBER_PART currently forced to run serially """ @@ -214,7 +214,7 @@ def PBC(config): processes = konfig['NUMBER_PART'] processes = min([1,processes]) - the_Command = 'SU2_PBC ' + tempname + the_Command = 'SU2_MSH ' + tempname the_Command = build_command( the_Command , processes ) run_command( the_Command ) diff --git a/SU2_PY/SU2/run/merge.py b/SU2_PY/SU2/run/merge.py index 5a2d3f93bbe..fad4b33fcac 100644 --- a/SU2_PY/SU2/run/merge.py +++ b/SU2_PY/SU2/run/merge.py @@ -1,7 +1,7 @@ ## \file merge.py # \brief python package for merging meshes # \author Tom Economon, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/run/projection.py b/SU2_PY/SU2/run/projection.py index 8af25e91d1a..bf7c5329df3 100644 --- a/SU2_PY/SU2/run/projection.py +++ b/SU2_PY/SU2/run/projection.py @@ -1,7 +1,7 @@ ## \file projection.py # \brief python package for running gradient projection # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory @@ -28,7 +28,7 @@ from .. import io as su2io from .. import util as su2util from decompose import decompose as su2decomp -from interface import GPC as SU2_GPC +from interface import DOT as SU2_DOT # ---------------------------------------------------------------------- @@ -40,7 +40,7 @@ def projection( config, step = 1e-3 ): Runs an gradient projection with: SU2.run.decomp() - SU2.run.GPC() + SU2.run.DOT() Assumptions: Redundant decomposition if config.DECOMPOSED == True @@ -76,7 +76,7 @@ def projection( config, step = 1e-3 ): assert len(step) == n_DV , 'unexpected step vector length' else: step = [step]*n_DV - dv_old = [0.0]*n_DV # SU2_GPC input requirement, assumes linear superposition of design variables + dv_old = [0.0]*n_DV # SU2_DOT input requirement, assumes linear superposition of design variables dv_new = step konfig.unpack_dvs(dv_new,dv_old) @@ -89,7 +89,7 @@ def projection( config, step = 1e-3 ): grad_plotname = os.path.splitext(grad_filename)[0] + '_' + adj_suffix + plot_extension # Run Projection - SU2_GPC(konfig) + SU2_DOT(konfig) # read raw gradients raw_gradients = su2io.read_gradients(grad_filename) diff --git a/SU2_PY/SU2/util/filter_adjoint.py b/SU2_PY/SU2/util/filter_adjoint.py index 7991ceb7ed6..35ec7aac80e 100644 --- a/SU2_PY/SU2/util/filter_adjoint.py +++ b/SU2_PY/SU2/util/filter_adjoint.py @@ -3,7 +3,7 @@ ## \file filter_adjoint.py # \brief Applies various filters to the adjoint surface sensitivities of an airfoil # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/util/plot.py b/SU2_PY/SU2/util/plot.py index 4c53aab5adb..1b1a24c38f0 100644 --- a/SU2_PY/SU2/util/plot.py +++ b/SU2_PY/SU2/util/plot.py @@ -3,7 +3,7 @@ ## \file plot.py # \brief python package for plotting # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/SU2/util/which.py b/SU2_PY/SU2/util/which.py index 62ad4c9e403..3d5be7edebc 100644 --- a/SU2_PY/SU2/util/which.py +++ b/SU2_PY/SU2/util/which.py @@ -1,7 +1,7 @@ ## \file which.py # \brief looks for where a program is # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # Stanford University Unstructured (SU2) Code # Copyright (C) 2012 Aerospace Design Laboratory diff --git a/SU2_PY/change_version_number.py b/SU2_PY/change_version_number.py index dc628cf0a92..49df682b388 100644 --- a/SU2_PY/change_version_number.py +++ b/SU2_PY/change_version_number.py @@ -3,7 +3,7 @@ ## \file change_version_number.py # \brief Python script for doing the continuous adjoint computation using the SU2 suite. # \author Aniket Aranake -# \version 3.0.1 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/compute_polar.py b/SU2_PY/compute_polar.py index 89f7fcc7340..cabff1b9971 100644 --- a/SU2_PY/compute_polar.py +++ b/SU2_PY/compute_polar.py @@ -3,7 +3,7 @@ ## \file shape_optimization.py # \brief Python script for performing the shape optimization. # \author Francisco Palacios, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/compute_stability.py b/SU2_PY/compute_stability.py index 3ef3715086e..2fffe57dbd0 100644 --- a/SU2_PY/compute_stability.py +++ b/SU2_PY/compute_stability.py @@ -3,7 +3,7 @@ ## \file compute_stability.py # \brief Python script for performing the shape optimization. # \author Francisco Palacios, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/config_gui.py b/SU2_PY/config_gui.py index bff2f7f723c..dbddc8d53a0 100644 --- a/SU2_PY/config_gui.py +++ b/SU2_PY/config_gui.py @@ -3,7 +3,7 @@ ## \file config_gui.py # \brief _____________. # \author Aniket Aranake -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/continuous_adjoint.py b/SU2_PY/continuous_adjoint.py index ee0ca206f29..e159913d391 100644 --- a/SU2_PY/continuous_adjoint.py +++ b/SU2_PY/continuous_adjoint.py @@ -3,7 +3,7 @@ ## \file continuous_adjoint.py # \brief Python script for doing the continuous adjoint computation using the SU2 suite. # \author Francisco Palacios, Tom Economon, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # @@ -40,7 +40,7 @@ def main(): parser.add_option("-c", "--compute", dest="compute", default="True", help="COMPUTE direct and adjoint problem", metavar="COMPUTE") parser.add_option("-s", "--step", dest="step", default=1E-4, - help="GPC finite difference STEP", metavar="STEP") + help="DOT finite difference STEP", metavar="STEP") parser.add_option("-d", "--divide_grid",dest="divide_grid",default="True", help="DIVIDE_GRID the numerical grid", metavar="DIVIDE_GRID") diff --git a/SU2_PY/documentation.txt b/SU2_PY/documentation.txt index 84bb56ee3ae..ad7fc411a26 100644 --- a/SU2_PY/documentation.txt +++ b/SU2_PY/documentation.txt @@ -14,13 +14,12 @@ no upstream pointer communication partitions set once in config initial read -SU2.run.DDC(config) +SU2.run.PRT(config) SU2.run.CFD(config) -SU2.run.MAC(config) -SU2.run.MDC(config) -SU2.run.GPC(config) +SU2.run.MSH(config) +SU2.run.DEF(config) +SU2.run.DOT(config) SU2.run.SMC(config) -SU2.run.PBC(config) interpret partitions dump config prepare os command @@ -37,7 +36,7 @@ all tools assume config['NUMBER_PART'] already set SU2.run.decomp(config) check for decomposition in config['DECOMPOSED'] = True/False - run DDC + run PRT pointer updated config 'DECOMPOSED' = True @@ -48,7 +47,7 @@ SU2.run.deform(config,dv_new=[]) 'DV_MARKER','DV_KIND','DV_PARAM' based on 'DEFINITION_DV' checks decomp adds 'deform' suffix to mesh_out - run MDC + run DEF pointer updated config 'MESH_FILENAME' = 'MESH_FILENAME'+'_deform' 'DV_VALUE_OLD' = 'DV_VALUE_NEW' @@ -84,7 +83,7 @@ SU2.run.projection(config,step=1e-4) checks decomp optional step float or vector update config - run GPC + run DOT read raw gradient file, remove file write plotable gradient file returns dictionary 'info' with keys: diff --git a/SU2_PY/filter_adjoint.py b/SU2_PY/filter_adjoint.py index 3c08bcd50c7..71301fbf3d9 100644 --- a/SU2_PY/filter_adjoint.py +++ b/SU2_PY/filter_adjoint.py @@ -3,7 +3,7 @@ ## \file filter_adjoint.py # \brief Applies various filters to the adjoint surface sensitivities of an airfoil # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/finite_differences.py b/SU2_PY/finite_differences.py index 89bfd4a40e4..14c5b9d9423 100644 --- a/SU2_PY/finite_differences.py +++ b/SU2_PY/finite_differences.py @@ -3,7 +3,7 @@ ## \file finite_differences.py # \brief Python script for doing the finite differences computation using the SU2 suite. # \author Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/merge_solution.py b/SU2_PY/merge_solution.py index 306e1676410..571c109dd86 100644 --- a/SU2_PY/merge_solution.py +++ b/SU2_PY/merge_solution.py @@ -3,7 +3,7 @@ ## \file merge_solution.py # \brief Python script for merging of the solution files. # \author Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/mesh_adaptation.py b/SU2_PY/mesh_adaptation.py index 8fff7416714..fa438cf43ee 100644 --- a/SU2_PY/mesh_adaptation.py +++ b/SU2_PY/mesh_adaptation.py @@ -3,7 +3,7 @@ ## \file mesh_adaptation.py # \brief Python script for doing the grid adaptation using the SU2 suite. # \author Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # @@ -79,7 +79,7 @@ def mesh_adaptation( filename , # Set the number of partitions for parallel computations config.NUMBER_PART = partitions - # Run SU2_DDC for parallel computations + # Run SU2_PRT for parallel computations SU2.run.decompose(config) # Call CFD to generate a solution @@ -88,8 +88,8 @@ def mesh_adaptation( filename , # Rename the output restart to the input solution file SU2.io.restart2solution(config) - # Call MAC - SU2.run.MAC(config) + # Call MSH + SU2.run.MSH(config) diff --git a/SU2_PY/mesh_deformation.py b/SU2_PY/mesh_deformation.py index 1fe5d7d1c02..8caac26418d 100644 --- a/SU2_PY/mesh_deformation.py +++ b/SU2_PY/mesh_deformation.py @@ -1,9 +1,9 @@ #!/usr/bin/env python ## \file mesh_deformation.py -# \brief Python script for doing the parallel deformation using SU2_MDC. +# \brief Python script for doing the parallel deformation using SU2_DEF. # \author Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # @@ -75,7 +75,7 @@ def mesh_deformation( filename , state.FILES.MESH = config.MESH_FILENAME # Deformation - info = SU2.run.MDC(config) + info = SU2.run.DEF(config) state.update(info) return state diff --git a/SU2_PY/package_tests.py b/SU2_PY/package_tests.py index d32b5e422a3..04fe9970292 100644 --- a/SU2_PY/package_tests.py +++ b/SU2_PY/package_tests.py @@ -44,7 +44,7 @@ # OUTPUT_WEIGHT # FINDIFF_STEP -# GPC_FINDIFF_STEP +# DOT_FINDIFF_STEP # GRADIENT_METHOD= FINITE_DIFFERENCING, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT # ADAPTATION= DIRECT, ADJOINT @@ -107,7 +107,7 @@ def level0(): config.EXT_ITER = 9 config.NUMBER_PART = 2 - SU2.run.DDC(config) + SU2.run.PRT(config) SU2.run.CFD(config) @@ -311,13 +311,13 @@ def mesh0(): config.EXT_ITER = 9 config.NUMBER_PART = 2 - SU2.run.DDC(config) + SU2.run.PRT(config) SU2.run.CFD(config) SU2.io.restart2solution(config) - SU2.run.MAC(config) + SU2.run.MSH(config) diff --git a/SU2_PY/parallel_computation.py b/SU2_PY/parallel_computation.py index 97c5771b2a8..f84b43887f1 100644 --- a/SU2_PY/parallel_computation.py +++ b/SU2_PY/parallel_computation.py @@ -3,7 +3,7 @@ ## \file parallel_computation.py # \brief Python script for doing the continuous adjoint computation using the SU2 suite. # \author Francisco Palacios, Tom Economon, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # @@ -35,7 +35,7 @@ def main(): parser=OptionParser() parser.add_option("-f", "--file", dest="filename", help="read config from FILE", metavar="FILE") - parser.add_option("-p", "--partitions", dest="partitions", default=2, + parser.add_option("-n", "--partitions", dest="partitions", default=2, help="number of PARTITIONS", metavar="PARTITIONS") parser.add_option("-c", "--compute", dest="compute", default="True", help="COMPUTE direct and adjoint problem", metavar="COMPUTE") diff --git a/SU2_PY/parse_config.py b/SU2_PY/parse_config.py index 582b752569d..dc9114417ef 100644 --- a/SU2_PY/parse_config.py +++ b/SU2_PY/parse_config.py @@ -3,7 +3,7 @@ ## \file parse_config.py # \brief Builds a worksheet of all SU2.cpp options # \author Aniket Aranake, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/patient_designspace.py b/SU2_PY/patient_designspace.py index fc25555560e..5b0915bd6e5 100644 --- a/SU2_PY/patient_designspace.py +++ b/SU2_PY/patient_designspace.py @@ -3,7 +3,7 @@ ## \file patient_designspace.py # \brief Python script for running multiple design configurations in multiple sessions # \author Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_PY/shape_optimization.py b/SU2_PY/shape_optimization.py index 339bcb0630c..d11831f1d12 100644 --- a/SU2_PY/shape_optimization.py +++ b/SU2_PY/shape_optimization.py @@ -3,7 +3,7 @@ ## \file shape_optimization.py # \brief Python script for performing the shape optimization. # \author Francisco Palacios, Tom Economon, Trent Lukaczyk, Aerospace Design Laboratory (Stanford University) . -# \version 3.1.0 "eagle" +# \version 3.2.0 "eagle" # # SU2, Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). # diff --git a/SU2_SOL/include/SU2_SOL.hpp b/SU2_SOL/include/SU2_SOL.hpp index a5005b86c42..a74d21c51b1 100644 --- a/SU2_SOL/include/SU2_SOL.hpp +++ b/SU2_SOL/include/SU2_SOL.hpp @@ -3,7 +3,7 @@ * \brief Headers of the main subroutines of the code SU2_SOL. * The subroutines and functions are in the SU2_SOL.cpp file. * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_SOL/obj/Makefile.am b/SU2_SOL/obj/Makefile.am index 2d2d671888e..feea8698df6 100644 --- a/SU2_SOL/obj/Makefile.am +++ b/SU2_SOL/obj/Makefile.am @@ -1,4 +1,4 @@ -# SU^2 Makefile.am for SOL +# SU2 Makefile.am for SOL # Stanford University Aerospace Design Lab # # Created: 3/16/13 diff --git a/SU2_SOL/obj/Makefile.in b/SU2_SOL/obj/Makefile.in index d13f61d4661..4d07ac2e910 100644 --- a/SU2_SOL/obj/Makefile.in +++ b/SU2_SOL/obj/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SU^2 Makefile.am for SOL +# SU2 Makefile.am for SOL # Stanford University Aerospace Design Lab # # Created: 3/16/13 diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp index 9665d6ec267..481bbdf8053 100644 --- a/SU2_SOL/src/SU2_SOL.cpp +++ b/SU2_SOL/src/SU2_SOL.cpp @@ -2,7 +2,7 @@ * \file SU2_SOL.cpp * \brief Main file for the solution export/conversion code (SU2_SOL). * \author Aerospace Design Laboratory (Stanford University) . - * \version 3.1.0 "eagle" + * \version 3.2.0 "eagle" * * SU2, Copyright (C) 2012-2014 Aerospace Design Laboratory (ADL). * diff --git a/SU2_UMC/bin/.gitignore b/SU2_UMC/bin/.gitignore deleted file mode 100644 index fe891329eff..00000000000 --- a/SU2_UMC/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Do not track compiled execuatables -SU2* diff --git a/SU2_UMC/include/SU2_UMC.hpp b/SU2_UMC/include/SU2_UMC.hpp deleted file mode 100644 index ea8c8c8204f..00000000000 --- a/SU2_UMC/include/SU2_UMC.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * \file SU2_UMC.hpp - * \brief Headers of the main subroutines of the code SU2_UMC. - * The subroutines and functions are in the SU2_UMC.cpp file. - * \author Aerospace Design Laboratory (Stanford University) . - * \version 2.0.9 - * - * Stanford University Unstructured (SU2). - * Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). - * - * 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 . - */ - -#pragma once - -#include -#include -#include -#include - -#include "../../Common/include/geometry_structure.hpp" -#include "../../Common/include/config_structure.hpp" -#include "../../Common/include/grid_movement_structure.hpp" - -using namespace std; - -/*--- function prototypes ---*/ -void Tracked_Points_to_Coords(CBoundaryGeometry *boundary); -void Make_Sectional_Cuts(CConfig *config, CBoundaryGeometry *boundary); -void clean_up(const char *filename); -bool fexists(const char *filename); -bool Compute_Sectional_Forces(); -string file_find(string input_file, unsigned short column, string entry); diff --git a/SU2_UMC/obj/Makefile.am b/SU2_UMC/obj/Makefile.am deleted file mode 100644 index 66db4389aa6..00000000000 --- a/SU2_UMC/obj/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# SU^2 Makefile.am for UMC -# Stanford University Aerospace Design Lab -# -# Created: 3/16/13 -# Last updated: 10/30/13 -# -# Created by: T. Economon -# Updated by: T. Economon -# -########################## - -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} - -bin_PROGRAMS = ../bin/SU2_UMC - -___bin_SU2_UMC_SOURCES = ../include/SU2_UMC.hpp \ - ../src/SU2_UMC.cpp - -___bin_SU2_UMC_CXXFLAGS = -___bin_SU2_UMC_LDADD = ../../Common/lib/libSU2.a - -# always link to built dependencies from ./externals -___bin_SU2_UMC_CXXFLAGS += @su2_externals_INCLUDES@ -___bin_SU2_UMC_LDADD += @su2_externals_LIBS@ - -# if BUILD_CGNS -___bin_SU2_UMC_CXXFLAGS += @CGNS_CXX@ -___bin_SU2_UMC_LDADD += @CGNS_LD@ -# endif - -# if BUILD_MUTATIONPP -___bin_SU2_UMC_CXXFLAGS += @MUTATIONPP_CXX@ -___bin_SU2_UMC_LDADD += @MUTATIONPP_LD@ -# endif - -# if BUILD_JSONCPP -___bin_SU2_UMC_CXXFLAGS += @JSONCPP_CXX@ -___bin_SU2_UMC_LDADD += @JSONCPP_LD@ -# endif diff --git a/SU2_UMC/obj/Makefile.in b/SU2_UMC/obj/Makefile.in deleted file mode 100644 index abae696ec19..00000000000 --- a/SU2_UMC/obj/Makefile.in +++ /dev/null @@ -1,628 +0,0 @@ -# Makefile.in generated by automake 1.12.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# SU^2 Makefile.am for UMC -# Stanford University Aerospace Design Lab -# -# Created: 3/16/13 -# Last updated: 10/30/13 -# -# Created by: T. Economon -# Updated by: T. Economon -# -########################## - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - 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;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -bin_PROGRAMS = ../bin/SU2_UMC$(EXEEXT) -subdir = SU2_UMC/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/ax_tls.m4 \ - $(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/tecio.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am__dirstamp = $(am__leading_dot)dirstamp -am____bin_SU2_UMC_OBJECTS = ../src/___bin_SU2_UMC-SU2_UMC.$(OBJEXT) -___bin_SU2_UMC_OBJECTS = $(am____bin_SU2_UMC_OBJECTS) -___bin_SU2_UMC_DEPENDENCIES = ../../Common/lib/libSU2.a -___bin_SU2_UMC_LINK = $(CXXLD) $(___bin_SU2_UMC_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(___bin_SU2_UMC_SOURCES) -DIST_SOURCES = $(___bin_SU2_UMC_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CGNS_CXX = @CGNS_CXX@ -CGNS_LD = @CGNS_LD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JSONCPP_CXX = @JSONCPP_CXX@ -JSONCPP_LD = @JSONCPP_LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -METIS_INCLUDE = @METIS_INCLUDE@ -METIS_LIB = @METIS_LIB@ -MKDIR_P = @MKDIR_P@ -MUTATIONPP_CXX = @MUTATIONPP_CXX@ -MUTATIONPP_LD = @MUTATIONPP_LD@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SU2_METIS_CPPFLAGS = @SU2_METIS_CPPFLAGS@ -TECIO_CPPFLAGS = @TECIO_CPPFLAGS@ -TECIO_INCLUDE = @TECIO_INCLUDE@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -su2_externals_INCLUDES = @su2_externals_INCLUDES@ -su2_externals_LIBS = @su2_externals_LIBS@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -___bin_SU2_UMC_SOURCES = ../include/SU2_UMC.hpp \ - ../src/SU2_UMC.cpp - - -# always link to built dependencies from ./externals - -# if BUILD_CGNS -# endif - -# if BUILD_MUTATIONPP -# endif - -# if BUILD_JSONCPP -___bin_SU2_UMC_CXXFLAGS = @su2_externals_INCLUDES@ @CGNS_CXX@ \ - @MUTATIONPP_CXX@ @JSONCPP_CXX@ $(am__empty) -___bin_SU2_UMC_LDADD = ../../Common/lib/libSU2.a @su2_externals_LIBS@ \ - @CGNS_LD@ @MUTATIONPP_LD@ @JSONCPP_LD@ $(am__empty) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SU2_UMC/obj/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign SU2_UMC/obj/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - 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; \ - done | \ - 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 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @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)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -../src/$(am__dirstamp): - @$(MKDIR_P) ../src - @: > ../src/$(am__dirstamp) -../src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) ../src/$(DEPDIR) - @: > ../src/$(DEPDIR)/$(am__dirstamp) -../src/___bin_SU2_UMC-SU2_UMC.$(OBJEXT): ../src/$(am__dirstamp) \ - ../src/$(DEPDIR)/$(am__dirstamp) -../bin/$(am__dirstamp): - @$(MKDIR_P) ../bin - @: > ../bin/$(am__dirstamp) -../bin/SU2_UMC$(EXEEXT): $(___bin_SU2_UMC_OBJECTS) $(___bin_SU2_UMC_DEPENDENCIES) $(EXTRA____bin_SU2_UMC_DEPENDENCIES) ../bin/$(am__dirstamp) - @rm -f ../bin/SU2_UMC$(EXEEXT) - $(AM_V_CXXLD)$(___bin_SU2_UMC_LINK) $(___bin_SU2_UMC_OBJECTS) $(___bin_SU2_UMC_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f ../src/*.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -../src/___bin_SU2_UMC-SU2_UMC.o: ../src/SU2_UMC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_UMC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_UMC-SU2_UMC.o -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Tpo -c -o ../src/___bin_SU2_UMC-SU2_UMC.o `test -f '../src/SU2_UMC.cpp' || echo '$(srcdir)/'`../src/SU2_UMC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Tpo ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_UMC.cpp' object='../src/___bin_SU2_UMC-SU2_UMC.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_UMC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_UMC-SU2_UMC.o `test -f '../src/SU2_UMC.cpp' || echo '$(srcdir)/'`../src/SU2_UMC.cpp - -../src/___bin_SU2_UMC-SU2_UMC.obj: ../src/SU2_UMC.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(___bin_SU2_UMC_CXXFLAGS) $(CXXFLAGS) -MT ../src/___bin_SU2_UMC-SU2_UMC.obj -MD -MP -MF ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Tpo -c -o ../src/___bin_SU2_UMC-SU2_UMC.obj `if test -f '../src/SU2_UMC.cpp'; then $(CYGPATH_W) '../src/SU2_UMC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_UMC.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Tpo ../src/$(DEPDIR)/___bin_SU2_UMC-SU2_UMC.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../src/SU2_UMC.cpp' object='../src/___bin_SU2_UMC-SU2_UMC.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_UMC_CXXFLAGS) $(CXXFLAGS) -c -o ../src/___bin_SU2_UMC-SU2_UMC.obj `if test -f '../src/SU2_UMC.cpp'; then $(CYGPATH_W) '../src/SU2_UMC.cpp'; else $(CYGPATH_W) '$(srcdir)/../src/SU2_UMC.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) - 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; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$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; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f ../bin/$(am__dirstamp) - -rm -f ../src/$(DEPDIR)/$(am__dirstamp) - -rm -f ../src/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-am - -rm -rf ../src/$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ../src/$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -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 - -# endif - -# 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. -.NOEXPORT: diff --git a/SU2_UMC/src/SU2_UMC.cpp b/SU2_UMC/src/SU2_UMC.cpp deleted file mode 100644 index a66d6a619be..00000000000 --- a/SU2_UMC/src/SU2_UMC.cpp +++ /dev/null @@ -1,1207 +0,0 @@ -/*! - * \file SU2_UMC.cpp - * \brief Main file for UMarc Coupling (SU2_UMC). - * \author Aerospace Design Laboratory (Stanford University) . - * \version 2.0.9 - * - * Stanford University Unstructured (SU2). - * Copyright (C) 2012-2013 Aerospace Design Laboratory (ADL). - * - * 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 . - */ - -#include "../include/SU2_UMC.hpp" - -int main(int argc, char *argv[]) { - - /*--- Local variables ---*/ - unsigned short mode, nZone = 1; - char grid_filename[200]; - bool complete; - - int rank = MASTER_NODE; -#ifdef HAVE_MPI - /*--- MPI initialization, and buffer setting ---*/ - MPI_Init(&argc,&argv); - MPI_Comm_rank(MPI_COMM_WORLD,&rank); -#endif - - /*--- Declare pointers to class objects ---*/ - CConfig *config = NULL; - CBoundaryGeometry *boundary = NULL; - - /*--- Instatiate an object of the config class - based on the name of the config file given ---*/ - strcpy(grid_filename, argv[1]); - config = new CConfig(grid_filename, SU2_GDC, ZONE_0, nZone, - 0, VERB_HIGH); - - /*--- Instantiate an object of the boundary-geometry class ---*/ - boundary = new CBoundaryGeometry(config, - config->GetMesh_FileName(), - config->GetMesh_FileFormat()); - - /*--- determine the mode of operation ---*/ - if (argc < 3) { - if (argc == 2) { - cout << "\t ------------------------------------------ \t" << endl; - cout << "\t *** ERROR! PLEASE ENTER A RUNNING MODE *** \t" << endl; - cout << "\t ------------------------------------------ \t" << endl; - return EXIT_SUCCESS; - } - if (argc == 1) { - cout << "\t -------------------------------------------------- \t" << endl; - cout << "\t *** ERROR! PLEASE ENTER A CONFIG FILE AND MODE *** \t" << endl; - cout << "\t -------------------------------------------------- \t" << endl; - return EXIT_SUCCESS; - } - } - mode = atoi(argv[2]); - cout << endl; - - switch (mode) { - - case 1: - cout << "\t ------------------------------------ \t" << endl; - cout << "\t *** AIRFOIL-SECTION-CUTTING MODE *** \t" << endl; - cout << "\t ------------------------------------ \t" << endl; - - /*--- if they exist, delete old versions of files "span," - "tracked_points," "Airfoil_Sections.plt," and - "coordinates.csv" ---*/ - cout << endl; - clean_up("span"); - clean_up("tracked_points"); - clean_up("Airfoil_Sections.plt"); - clean_up("coordinates.csv"); - - /*--- make the sectional cuts along the surfaces of interest and - write the files "span," "tracked_points," and - "Airfoil_Sections.plt" to the current directory ---*/ - Make_Sectional_Cuts(config, boundary); - - /*--- find the coordinates of the sections and - print to the "coordinate.csv" file ---*/ - Tracked_Points_to_Coords(boundary); - - break; - - case 2: - cout << "\t ------------------------------------------ \t" << endl; - cout << "\t *** SECTIONAL-FORCES MODE (SU2->UMARC) *** \t" << endl; - cout << "\t ------------------------------------------ \t" << endl; - - /*--- recompute the coordinates and rewrite "coordinates.csv" - file, just in case the geometry has been deformed since - running mode 1. N.B. The original cuts can still be found - in "Airfoil_Sections.plt" ---*/ - cout << endl; - clean_up("coordinates.csv"); - Tracked_Points_to_Coords(boundary); - - /*--- read the new coordinates, find the corresponding values - of pressure from "surface_flow.csv," and write the - sectional-forces files cl, cd, and cm ---*/ - complete = Compute_Sectional_Forces(); - - - - - - if (complete == false) { - cout << endl << "Sectional forces have not been computed properly." << endl; - return EXIT_SUCCESS; - } - - break; - - case 3: - cout << "\t --------------------------------------------------- \t" << endl; - cout << "\t *** DEFORMATION-COMMUNICATION MODE (UMARC->SU2) *** \t" << endl; - cout << "\t --------------------------------------------------- \t" << endl; - - break; - - default: - cout << "\t -------------------------------------------- \t" << endl; - cout << "\t *** ERROR! PLEASE RUN IN MODE 1, 2, OR 3 *** \t" << endl; - cout << "\t -------------------------------------------- \t" << endl; - return EXIT_SUCCESS; - } - - /*--- Delete dynamically allocated memory ---*/ - if (config != NULL) delete config; - if (boundary != NULL) delete boundary; - - /*--- End routine ---*/ - cout << endl <<"------------------------- Exit Success (SU2_UMC) ------------------------" << endl << endl; - - return EXIT_SUCCESS; - -} - -void Make_Sectional_Cuts(CConfig *config, CBoundaryGeometry *boundary) { - - /*--- Local variables ---*/ - unsigned short nDim, nMarker, nSection, iDim, iMarker, iSection, - Boundary; - unsigned long iNode, nNode; - vector **point1_Airfoil, **point2_Airfoil; - double root, tip, minPlane, maxPlane, radial_station, interval, - starting_angle, starting_rad, rotation, magnitude; - double starting_vec [3]; - double *Plane_P0, *Plane_Normal; - vector *Xcoord_Airfoil, *Ycoord_Airfoil, *Zcoord_Airfoil, - **weight1_Airfoil; - bool Monitoring, CCW_orientation; - string Marker_Tag, filename; - ofstream span, tracked_points; - - /*--- intialize the various pointers to null ---*/ - Xcoord_Airfoil = NULL; - Ycoord_Airfoil = NULL; - Zcoord_Airfoil = NULL; - point1_Airfoil = NULL; - point2_Airfoil = NULL; - weight1_Airfoil = NULL; - Plane_P0 = NULL; - Plane_Normal = NULL; - - /*--- find the number of dimensions in the problem ---*/ - nDim = boundary->GetnDim(); - - /*--- find the number of markers in the mesh ---*/ - nMarker = boundary->GetnMarker(); - - if (nDim == 3) { - - /*--- USER-DEFINED: set the total number - of slices for all markers ---*/ - nSection = 15; - - /*--- USER-DEFINED: provide the locations, in the spanwise - direction, of the blade/wing root and tip ---*/ - root = 0.0; - tip = 14.0; - - /*--- USER-DEFINED: set the starting and ending - points of the slices (N.B. These need not - be the same as the root and tip locations) ---*/ - minPlane = root; - maxPlane = tip; - - /*--- initialize coordinate vectors --*/ - Xcoord_Airfoil = new vector [nSection]; - Ycoord_Airfoil = new vector [nSection]; - Zcoord_Airfoil = new vector [nSection]; - - /*--- iniitialize the 2D arrays of vectors ---*/ - point1_Airfoil = new vector *[nMarker]; - point2_Airfoil = new vector *[nMarker]; - weight1_Airfoil = new vector *[nMarker]; - for (iMarker = 0; iMarker < nMarker; iMarker++) { - point1_Airfoil[iMarker] = new vector [nSection]; - point2_Airfoil[iMarker] = new vector [nSection]; - weight1_Airfoil[iMarker] = new vector [nSection]; - } - - /*--- For now, the slicing planes are hard-coded for each - marker, but this will be added to the config file in the - future. ---*/ - Plane_P0 = new double [3]; - Plane_Normal = new double [3]; - - for (iMarker = 0; iMarker < nMarker; iMarker++) { - Boundary = config->GetMarker_All_Boundary(iMarker); - Monitoring = config->GetMarker_All_Monitoring(iMarker); - if ((Boundary == EULER_WALL) || - (Boundary == HEAT_FLUX) || - (Boundary == ISOTHERMAL) || - (Boundary == NEARFIELD_BOUNDARY)) { - if (Monitoring) { - - /*--- retreive the name of the current marker ---*/ - Marker_Tag = config->GetMarker_All_Tag(iMarker); - - /*--- USER-DEFINED: angle (in degrees) - the blade/wing is originally at - N.B. This only works if you're in the X-Y plane---*/ - - /*--- ONERA M6 WING ---*/ - if (Marker_Tag == "WING") { - starting_angle = 90.0; - root = 0.0; - tip = 14.0; - minPlane = root; - maxPlane = tip; - CCW_orientation = 1; - } - - /*--- UH-60 FIRST blade ---*/ - if (Marker_Tag == "Blade1") { - starting_angle = 0.0; - root = 1.0; - tip = 8.2; - minPlane = 1.5; - maxPlane = 7.5; - CCW_orientation = 1; - } - - /*--- UH-60 SECOND blade ---*/ - if (Marker_Tag == "Blade2") { - starting_angle = 90.0; - root = 1.0; - tip = 8.2; - minPlane = 1.5; - maxPlane = 7.5; - CCW_orientation = 1; - } - - /*--- UH-60 THIRD blade ---*/ - if (Marker_Tag == "Blade3") { - starting_angle = 180.0; - root = 1.0; - tip = 8.2; - minPlane = 1.5; - maxPlane = 7.5; - CCW_orientation = 1; - } - - /*--- UH-60 FOURTH blade ---*/ - if (Marker_Tag == "Blade4") { - starting_angle = 270.0; - root = 1.0; - tip = 8.2; - minPlane = 1.5; - maxPlane = 7.5; - CCW_orientation = 1; - } - - /*--- Caradonna-Tung FIRST blade ---*/ - if (Marker_Tag == "blade_1") { - starting_angle = 90.0; - root = 0.15; - tip = 1.14; - minPlane = root; - maxPlane = tip; - CCW_orientation = 0; - } - - /*--- Caradonna-Tung SECOND blade ---*/ - if (Marker_Tag == "blade_2") { - starting_angle = 270.0; - root = 0.15; - tip = 1.14; - minPlane = root; - maxPlane = tip; - CCW_orientation = 0; - } - - /*--- USER INPUTS ABOUT GEOMETRY END HERE ---*/ - - /*--- comupte the distance between sections ---*/ - interval = (maxPlane-minPlane)/double(nSection-1); - - /*--- write the "span" file, listing the radial - stations along the geometry being sliced ---*/ - span.precision(15); - span.open("span", ios::out); - for (iSection = nSection; iSection > 0; iSection--) { - radial_station = minPlane + (iSection-1)*interval; - span << (radial_station-root)/(tip-root) << endl; - } - span.close(); - - /*--- using the user-defined inputs, compute the - points and planes that define the sections ---*/ - - /*--- convert the starting angle to radians ---*/ - starting_rad = starting_angle*(PI_NUMBER/180.0); - - /*--- section cutting ---*/ - - /*--- compute the vector pointing - along the blade/wing ---*/ - starting_vec[0] = cos(starting_rad); - starting_vec[1] = sin(starting_rad); - starting_vec[2] = 0.0; - - /*--- USER DEFINED: if, for whatever reason, the mesh is - rotated from the starting angles supplied above, - enter that rotation in degrees here. ---*/ - rotation = 0.0; - - /*--- find the vector pointing along this blade ---*/ - Plane_Normal[0] = cos(rotation)*starting_vec[0] - - sin(rotation)*starting_vec[1] + - 0.0*starting_vec[2]; - Plane_Normal[1] = sin(rotation)*starting_vec[0] + - cos(rotation)*starting_vec[1] + - 0.0*starting_vec[2]; - Plane_Normal[2] = 0.0*starting_vec[0] + - 0.0*starting_vec[1] + - 1.0*starting_vec[2]; - - /*--- turn it into a unit vector ---*/ - magnitude = sqrt(pow(Plane_Normal[0],2.0) + - pow(Plane_Normal[1],2.0) + - pow(Plane_Normal[2],2.0)); - for (iDim = 0; iDim < nDim; iDim++) { - Plane_Normal[iDim] /= magnitude; - if (fabs(Plane_Normal[iDim]) < 1e-5) { - Plane_Normal[iDim] = 0.0; - } - } - - /*--- print marker information to the screen ---*/ - cout << endl << "Marker: " << Marker_Tag << endl; - cout << " Points along: {"; - cout << Plane_Normal[0] << ", "; - cout << Plane_Normal[1] << ", "; - cout << Plane_Normal[2] << "}" << endl; - cout << " Sectional cuts pass through the points:" << endl; - - - - /*--- walk along each marker, making sectional cuts ---*/ - for (iSection = 0; iSection < nSection; iSection++) { - - /*--- find the point that defines the cutting plane ---*/ - for (iDim = 0; iDim < nDim; iDim++) { - Plane_P0[iDim] = Plane_Normal[iDim]*(minPlane + - (double)iSection*interval); - } - - cout << " Section #" << iSection << ": {"; - cout << Plane_P0[0] << ", "; - cout << Plane_P0[1] << ", "; - cout << Plane_P0[2] << "}" << endl; - -// /*--- find the points defining the airfoil section --*/ -// boundary->ComputeAirfoil_Section(Plane_P0, Plane_Normal, -// iSection, config, -// Xcoord_Airfoil[iSection], -// Ycoord_Airfoil[iSection], -// Zcoord_Airfoil[iSection], -// point1_Airfoil[iMarker][iSection], -// point2_Airfoil[iMarker][iSection], -// weight1_Airfoil[iMarker][iSection], -// true, CCW_orientation); - - /*--- writing of the tracked-points file.this file - records the node number of the edges being - interescted as well as the correspond "weight" of - the first point, based on distance. ---*/ - - /*--- write the header ---*/ - if (iMarker == 0 && iSection == 0) { - tracked_points.precision(15); - filename = "tracked_points"; - tracked_points.open(filename.c_str(), ios::out); - tracked_points << "Marker_Name, Marker_Number, "; - tracked_points << "Section, "; - tracked_points << "point1, point2, weight1" << endl; - tracked_points.close(); - } - - /*--- find the number of nodes for - the current airfoil section ---*/ - nNode = point1_Airfoil[iMarker][iSection].size(); - - /*--- print information to filefile for a given node - at a given section on a given marker ---*/ - tracked_points.open(filename.c_str(), ios::out | ios::app); - for (iNode = 0; iNode < nNode; iNode++) { - tracked_points << Marker_Tag << ", " << iMarker << ", "; - tracked_points << iSection << ", "; - tracked_points << point1_Airfoil[iMarker][iSection].at(iNode) << ", "; - tracked_points << point2_Airfoil[iMarker][iSection].at(iNode) << ", "; - tracked_points << weight1_Airfoil[iMarker][iSection].at(iNode) << endl; - } - - /*--- close the file tracking points---*/ - tracked_points.close(); - - } /*--- end loop over sections ---*/ - - } - } - } - - /*--- delete the dynamically allocated memory ---*/ - if (Xcoord_Airfoil != NULL) {delete [] Xcoord_Airfoil;} - if (Ycoord_Airfoil != NULL) {delete [] Ycoord_Airfoil;} - if (Zcoord_Airfoil != NULL) {delete [] Zcoord_Airfoil;} - if (Plane_P0 != NULL) {delete [] Plane_P0;} - if (Plane_Normal != NULL) {delete [] Plane_Normal;} - if (point1_Airfoil != NULL) { - for (iMarker = 0; iMarker < nMarker; iMarker++) { - for (iSection = 0; iSection < nSection; iSection++) { - point1_Airfoil[iMarker][iSection].clear(); - } - delete [] point1_Airfoil[iMarker]; - } - delete [] point1_Airfoil; - } - if (point2_Airfoil != NULL) { - for (iMarker = 0; iMarker < nMarker; iMarker++) { - for (iSection = 0; iSection < nSection; iSection++) { - point2_Airfoil[iMarker][iSection].clear(); - } - delete [] point2_Airfoil[iMarker]; - } - delete [] point2_Airfoil; - } - if (weight1_Airfoil != NULL) { - for (iMarker = 0; iMarker < nMarker; iMarker++) { - for (iSection = 0; iSection < nSection; iSection++) { - weight1_Airfoil[iMarker][iSection].clear(); - } - delete [] weight1_Airfoil[iMarker]; - } - delete [] weight1_Airfoil; - } - - } - else { - cout << "WARNING: SU2_UMC cannot be run for one- or two-dimensional problems" << endl; - } - -} - -void Tracked_Points_to_Coords(CBoundaryGeometry *boundary) { - - /*--- local variables ---*/ - fstream tp_file; - ofstream coords_file; - string line; - unsigned short counter, iDim, nDim; - unsigned long point1, point2; - double weight1, weight2, x_coord, y_coord, z_coord; - double *coord1, *coord2; - bool dummy; - - /*--- preliminaries ---*/ - nDim = boundary->GetnDim(); - coord1 = NULL; - coord2 = NULL; - - /*--- dynamically allocate memory ---*/ - coord1 = new double [nDim]; - coord2 = new double [nDim]; - - /*--- read the tracked points file ---*/ - tp_file.open("tracked_points"); - coords_file.open("coordinates.csv", ios::out | ios::app); - coords_file.precision(15); - - if (tp_file.is_open() && coords_file.is_open()) { - - /*--- read the header ---*/ - getline(tp_file,line); - - /*--- read through each line ---*/ - while (getline(tp_file,line)) { - - - /*--- turn it into a char array ---*/ - char tmp [500]; - strcpy(tmp,line.c_str()); - - /*--- read the line, storing point1, point2, and weight1 ---*/ - char *pointer_to = NULL; - pointer_to = strtok(tmp," (,)\r\n"); - - counter = 1; - while (pointer_to != NULL) { - - switch (counter) { - case 4: - point1 = strtoul(pointer_to,NULL,0); - break; - case 5: - point2 = strtoul(pointer_to,NULL,0); - break; - case 6: - weight1 = strtod(pointer_to,NULL); - break; - default: - dummy = 0; - } - pointer_to = strtok(NULL," (,)\r\n"); - counter++; - } - - /*--- convert the points to coordinates ---*/ - for (iDim = 0; iDim < nDim; iDim++) { - coord1[iDim] = boundary->node[point1]->GetCoord(iDim); - coord2[iDim] = boundary->node[point2]->GetCoord(iDim); - } - - /*--- retreive & compute the weight of the second node ---*/ - weight2 = 1.0 - weight1; - - /*--- find the new coordinates of the section---*/ - x_coord = weight1*coord1[0] + weight2*coord2[0]; - y_coord = weight1*coord1[1] + weight2*coord2[1]; - z_coord = weight1*coord1[2] + weight2*coord2[2]; - - /*--- write to the coordinates file ---*/ - coords_file << x_coord << ", "; - coords_file << y_coord << ", "; - coords_file << z_coord << endl; - - } - - /*--- close the files ---*/ - tp_file.close(); - coords_file.close(); - - } - else { - if (tp_file.is_open()) - cout << "Unable to open \"coordinates.csv\" file!" << endl; - if (coords_file.is_open()) - cout << "Unable to open \"tracked points\" file!" << endl; - } - - /*--- delete dynamically allocated memory ---*/ - if (coord1 != NULL) {delete [] coord1;} - if (coord2 != NULL) {delete [] coord2;} - -} - -void clean_up(const char *filename) { - - /*--- if the exists, delete it ---*/ - if (fexists(filename) == true) { - if(remove(filename) != 0) { - cout << "Error: Old copy of \"" << filename; - cout << "\" not deleted!" << endl; - } - else { - cout << "N.B. Old copy of \"" << filename; - cout << "\" deleted." << endl; - } - } - -} - -bool fexists(const char *filename) { - - /*--- TRUE if the file exists ---*/ - ifstream ifile(filename); - return ifile; - -} - -bool Compute_Sectional_Forces() { - - /*--- local variables ---*/ - fstream span_file, tp_file, coords_file; - unsigned short nSection, nMarker, old_size, new_size, - i, iMarker, iSection, counter, iDim, nDim=3, - iSegment, nSegment; - unsigned long the_section, point1, point2, nNodes, iNode; - vector *point1_Airfoil, *point2_Airfoil; - double weight1, coord, maxDistance, distance, chord, - x_node, y_node, z_node, first_line_x, first_line_y, first_line_z; - double *normal_force, *chord_force, *pitching_moment, - *cl, *cd, *cm; - double trailing_node [3], leading_node [3], chord_line [3], - q_chord [3], first_line [3], section_normal [3], - normal_line [3]; - vector *Xcoord_Airfoil, *Ycoord_Airfoil, *Zcoord_Airfoil, - *weight1_Airfoil; - string line, previous, current_marker, row, the_marker; - vector markers; - char tmp[200]; - char *pointer_to; - int line_number; - bool dummy; - - - /*--- intialize the various pointers to null ---*/ - pointer_to = NULL; - Xcoord_Airfoil = NULL; - Ycoord_Airfoil = NULL; - Zcoord_Airfoil = NULL; - point1_Airfoil = NULL; - point2_Airfoil = NULL; - weight1_Airfoil = NULL; - normal_force = NULL; - chord_force = NULL; - pitching_moment = NULL; - cl = NULL; - cd = NULL; - cm = NULL; - - /*--- check for the "span" file ---*/ - if (fexists("span") == false) { - cout << endl; - cout << "*** ERROR! \"span\" does not exist! ***" << endl; - cout << "*** Please run mode 1 before running mode 2 ***" << endl; - return 0; - } - - /*--- check for the "tracked_points" file ---*/ - if (fexists("tracked_points") == false) { - cout << endl; - cout << "*** ERROR! \"tracked_points\" does not exist! ***" << endl; - cout << "*** Please run mode 1 before running mode 2 ***" << endl; - return 0; - } - - /*--- check for the "coordinates.csv" file ---*/ - if (fexists("coordinates.csv") == false) { - cout << endl; - cout << "*** ERROR! \"coordinates.csv\" does not exist! ***" << endl; - cout << "*** Please check subroutine Tracked_Points_to_Coords ***" << endl; - return 0; - } - - /*--- find the number of sections by reading the "span" file ---*/ - nSection = 0; - span_file.open("span"); - if (span_file.is_open()) { - while (getline(span_file,line)) { - nSection++; - } - } - else - cout << endl << "Unable to open \"span\" file!" << endl; - span_file.close(); - - /*--- print number of cuts to the screen ---*/ - if (nSection == 1) - cout << endl << "There is one sectional cut "; - else - cout << endl << "There are " << nSection << " sectional cuts "; - cout << "along each marker." << endl; - - /*--- initialize coordinate vectors --*/ - Xcoord_Airfoil = new vector [nSection]; - Ycoord_Airfoil = new vector [nSection]; - Zcoord_Airfoil = new vector [nSection]; - - /*--- initialize the interpolating vectors ---*/ - point1_Airfoil = new vector [nSection]; - point2_Airfoil = new vector [nSection]; - weight1_Airfoil = new vector [nSection]; - - /*--- dynamically-defined arrays for airfoil normal - force, chord force, and pitching moment - - and their nondimensional coefficients ---*/ - normal_force = new double [nSection]; - chord_force = new double [nSection]; - pitching_moment = new double [nSection]; - cl = new double [nSection]; - cd = new double [nSection]; - cm = new double [nSection]; - - /*--- find the number of markers in the "tracked_points" file ---*/ - tp_file.open("tracked_points"); - if (tp_file.is_open()) { - - /*--- read through the file, reading the marker names ---*/ - cout << endl << "Markers found in \"tracked_points.\"" << endl; - line_number = 1; - old_size = 0; - while (getline(tp_file,line)) { - - /*--- if the marker name changes, make a record of it ---*/ - if (line_number != 1) { - - strcpy(tmp,line.c_str()); - pointer_to = strtok(tmp," ,\r\n"); - - if (line_number == 2) - markers.push_back(pointer_to); - else { - previous = markers.at(markers.size()-1); - if (pointer_to != previous) - markers.push_back(pointer_to); - } - - /*--- increment the line number ---*/ - line_number++; - } - else { - /*--- skip the header ---*/ - line_number++; - } - - /*--- print marker-name information to the screen --*/ - new_size = markers.size(); - if (old_size != new_size) { - cout << " -at line #" << line_number << ": "; - cout << "( "; - for (i = 0; i < markers.size(); i++ ) { - cout << markers.at(i); - if (i < markers.size()-1) - cout << ", "; - else - cout << " )" << endl; - } - old_size = new_size; - } - } - } - else - cout << endl << "Unable to open \"tracked_points\" file!" << endl; - tp_file.close(); - nMarker = markers.size(); - - - /*--- loop over the markers ---*/ - for (iMarker = 0; iMarker < nMarker; iMarker++) { - - /*--- identify the name of the marker we're interested in ---*/ - current_marker = markers.at(iMarker); - - /*--- since we've started working with a new marker, - clear the arrays of coordinate vectors ---*/ - for (iSection = 0; iSection < nSection; iSection++) { - Xcoord_Airfoil[iSection].clear(); - Ycoord_Airfoil[iSection].clear(); - Zcoord_Airfoil[iSection].clear(); - } - - /*--- read from the "tracked_points" file and from the - "coordinates.csv" to populate the coordinate vectors ---*/ - tp_file.open("tracked_points"); - coords_file.open("coordinates.csv"); - if (tp_file.is_open() && coords_file.is_open()) { - - /*--- read the header of "tracked_points" ---*/ - getline(tp_file,line); - - /*--- read through the rows in "coordinates.csv" ---*/ - while (getline(coords_file,row)) { - - /*--- read the corresponding line in "tracked_points" ---*/ - getline(tp_file,line); - - /*--- turn it into a char array ---*/ - strcpy(tmp,line.c_str()); - - /*--- read the line, storing the marker name, - section number, point1, point2, and weight1 ---*/ - pointer_to = strtok(tmp," ,\r\n"); - - counter = 1; - while (pointer_to != NULL) { - - switch (counter) { - case 1: - the_marker = pointer_to; - break; - case 3: - the_section = strtoul(pointer_to,NULL,0); - break; - case 4: - point1 = strtoul(pointer_to,NULL,0); - point1_Airfoil[the_section].push_back(point1); - break; - case 5: - point2 = strtoul(pointer_to,NULL,0); - point2_Airfoil[the_section].push_back(point2); - break; - case 6: - weight1 = strtod(pointer_to,NULL); - weight1_Airfoil[the_section].push_back(weight1); - break; - default: - dummy = 0; - } - - /*--- move to the next entry in the line ---*/ - pointer_to = strtok(NULL," ,\r\n"); - - /*--- increment the counter ---*/ - counter++; - - } /*--- end reading line in "tracked_points" ---*/ - - /*--- for all the intersection points along this marker, - start filling up the arrays of coordinate vectors ---*/ - if (the_marker == current_marker) { - - /*--- turn the row into a char array ---*/ - strcpy(tmp,row.c_str()); - - /*--- read the line, storing the marker name, - section number, point1, point2, and weight1 ---*/ - pointer_to = strtok(tmp," ,\r\n"); - - counter = 1; - while (pointer_to != NULL) { - - /*--- convert to a double ---*/ - coord = strtod(pointer_to,NULL); - - switch (counter) { - case 1: - Xcoord_Airfoil[the_section].push_back(coord); - break; - case 2: - Ycoord_Airfoil[the_section].push_back(coord); - break; - case 3: - Zcoord_Airfoil[the_section].push_back(coord); - break; - default: - dummy = 0; - } - - /*--- move to the next entry in the row ---*/ - pointer_to = strtok(NULL," ,\r\n"); - - /*--- increment the counter ---*/ - counter++; - - } /*--- end reading line in "coordinates.csv" ---*/ - - } /*--- end if (the_marker == current_marker) ---*/ - - } /*--- end reading rows in "coordinates.csv" ---*/ - - } /*--- end if (the files are open) ---*/ - else { - if (tp_file.is_open()) - cout << "Unable to open \"coordinates.csv\" file!" << endl; - if (coords_file.is_open()) - cout << "Unable to open \"tracked points\" file!" << endl; - } - tp_file.close(); - coords_file.close(); - - /*--- loop over the sections and find the integrated forces ---*/ - for (iSection = 0; iSection < nSection; iSection++) { - - /*--- find the number of intersection points - defining this arifoil section ---*/ - nNodes = Xcoord_Airfoil[iSection].size(); - - /*--- find the node that corresponds to the trailing edge ---*/ - trailing_node[0] = Xcoord_Airfoil[iSection].at(0); - trailing_node[1] = Ycoord_Airfoil[iSection].at(0); - trailing_node[2] = Zcoord_Airfoil[iSection].at(0); - - /*--- find the node that corresponds to the leading edge ---*/ - maxDistance = 0; - for (iNode = 1; iNode < nNodes; iNode++) { - - /*--- compute the distance from the trailing edge ---*/ - x_node = Xcoord_Airfoil[iSection].at(iNode); - y_node = Ycoord_Airfoil[iSection].at(iNode); - z_node = Zcoord_Airfoil[iSection].at(iNode); - distance = sqrt(pow(trailing_node[0]-x_node,2.0) - + pow(trailing_node[1]-y_node,2.0) - + pow(trailing_node[2]-z_node,2.0)); - - /*--- assume the leading edge is the point - farthest away from the trailing edge ---*/ - if (distance > maxDistance) { - maxDistance = distance; - leading_node[0] = x_node; - leading_node[1] = y_node; - leading_node[2] = z_node; - } - } - - /*--- compute the length of the chord ---*/ - chord = sqrt(pow(trailing_node[0]-leading_node[0],2.0) - + pow(trailing_node[1]-leading_node[1],2.0) - + pow(trailing_node[2]-leading_node[2],2.0)); - - /*--- define vector pointing from the trailing - edge to the leading edge ---*/ - for (iDim = 0; iDim < nDim; iDim++) { - chord_line[iDim] = leading_node[iDim]-trailing_node[iDim]; - } - - /*--- find the coordinates of the quarter-chord point - (move three-quarters of the chord - length along the chord line) ---*/ - for (iDim = 0; iDim < nDim; iDim++) { - q_chord[iDim] = trailing_node[iDim]+0.75*chord_line[iDim]; - } - - /*--- find the vector that points from the trailing node to - the first point along the top of the airfoil surface - (assume that this is always the - second point of the coord vectors.) ---*/ - first_line_x = Xcoord_Airfoil[iSection].at(1); - first_line_y = Ycoord_Airfoil[iSection].at(1); - first_line_z = Zcoord_Airfoil[iSection].at(1); - first_line[0] = first_line_x - trailing_node[0]; - first_line[1] = first_line_y - trailing_node[1]; - first_line[2] = first_line_z - trailing_node[2]; - - /*--- find the vector that lies normal to the plane of the - airfoil (we are assuming, that after a deformation, the - plane's normal will no longer be oriented in the - conventional +Y direction.) ---*/ - section_normal[0] = chord_line[1]*first_line[2] - chord_line[2]*first_line[1]; - section_normal[1] = chord_line[2]*first_line[0] - chord_line[0]*first_line[2]; - section_normal[2] = chord_line[0]*first_line[1] - chord_line[1]*first_line[0]; - - /*--- find the direction of the normal force (take a cross - product between the section normal and the chordline) ---*/ - normal_line[0] = section_normal[1]*chord_line[2] - section_normal[2]*chord_line[1]; - normal_line[1] = section_normal[2]*chord_line[0] - section_normal[0]*chord_line[2]; - normal_line[2] = section_normal[0]*chord_line[1] - section_normal[1]*chord_line[0]; - - /*--- define the number of segments along the section ---*/ - nSegment = Xcoord_Airfoil[iSection].size()-1; - - /*--- Information about each segment along the airfoil section - will be stored in a structure of type segment_t ---*/ - struct segment_t { - double endpoint1 [3]; // coordinates of the first endpoint - double endpoint2 [3]; // coordinates of the second endpoint - double length; // segment length - double midpoint [3]; // coordinates of the segment midpoint - double normal [3]; // components of the outward-pointing unit normal - double normal_force; // force per unit length projected 90 degs above chordline - double chord_force; // force per unit length projected along the chordline - double pitching_moment; // force/unit length times lever arm (midpoint to quarter chord) - double pressure_endpoint1; // pressure at point 1 - double pressure_endpoint2; // pressure at point 2 - }; - - segment_t *segments; // pointer of type segment_t - segments = new segment_t [nSegment]; // array of structures - - /*--- append the first entry (corresponding to the trailing - point) to the ends of the coord vectors and the - interpolating vectors so that we have easily identifiable - segments all around the airfoil section. ---*/ - vector Xcoord_around, Ycoord_around, Zcoord_around, weight1_around; - vector point1_around, point2_around; - - Xcoord_around = Xcoord_Airfoil[iSection]; - Xcoord_around.push_back(Xcoord_Airfoil[iSection].at(0)); - - Ycoord_around = Ycoord_Airfoil[iSection]; - Ycoord_around.push_back(Ycoord_Airfoil[iSection].at(0)); - - Zcoord_around = Zcoord_Airfoil[iSection]; - Zcoord_around.push_back(Zcoord_Airfoil[iSection].at(0)); - - point1_around = point1_Airfoil[iSection]; - point1_around.push_back(point1_Airfoil[iSection].at(0)); - - point2_around = point2_Airfoil[iSection]; - point2_around.push_back(point2_Airfoil[iSection].at(0)); - - weight1_around = weight1_Airfoil[iSection]; - weight1_around.push_back(weight1_Airfoil[iSection].at(0)); - - /*--- for each segment around the airfoil, populate a data structure ---*/ - for (iSegment = 0; iSegment < nSegment; iSegment++) { - - /*--- coordinates of first endpoint ---*/ - segments[iSegment].endpoint1[0] = Xcoord_around.at(iSegment); - segments[iSegment].endpoint1[1] = Ycoord_around.at(iSegment); - segments[iSegment].endpoint1[2] = Zcoord_around.at(iSegment); - - /*--- coordinates of second endpoint ---*/ - segments[iSegment].endpoint2[0] = Xcoord_around.at(iSegment+1); - segments[iSegment].endpoint2[1] = Ycoord_around.at(iSegment+1); - segments[iSegment].endpoint2[2] = Zcoord_around.at(iSegment+1); - - /*--- segment length ---*/ - double deltaX = segments[iSegment].endpoint2[0] - segments[iSegment].endpoint1[0]; - double deltaY = segments[iSegment].endpoint2[1] - segments[iSegment].endpoint1[1]; - double deltaZ = segments[iSegment].endpoint2[2] - segments[iSegment].endpoint1[2]; - segments[iSegment].length = sqrt(pow(deltaX,2.0) + pow(deltaY,2.0) + pow(deltaZ,2.0)); - - /*--- coordinates of the segment midpoint ---*/ - for (iDim = 0; iDim < nDim; iDim++) { - segments[iSegment].midpoint[iDim] = 0.5*(segments[iSegment].endpoint1[iDim] - + segments[iSegment].endpoint2[iDim]); - } - - /*--- compute the unit "tangent" vector, i.e. - the vector pointing along the segment ---*/ - double tangent [3]; - tangent[0] = (1.0/segments[iSegment].length)*(deltaX); - tangent[1] = (1.0/segments[iSegment].length)*(deltaY); - tangent[2] = (1.0/segments[iSegment].length)*(deltaZ); - - /*--- compute the outward-pointing normal ---*/ - segments[iSegment].normal[0] = section_normal[1]*tangent[2] - section_normal[2]*tangent[1]; - segments[iSegment].normal[1] = section_normal[2]*tangent[0] - section_normal[0]*tangent[2]; - segments[iSegment].normal[2] = section_normal[0]*tangent[1] - section_normal[1]*tangent[0]; - - /*--- compute the outward-pointing unit normal ---*/ - double norm_dot_norm = pow(segments[iSegment].normal[0],2.0) - + pow(segments[iSegment].normal[1],2.0) - + pow(segments[iSegment].normal[2],2.0); - double normal_length = sqrt(norm_dot_norm); - for (iDim = 0; iDim < nDim; iDim++) { - segments[iSegment].normal[iDim] = segments[iSegment].normal[iDim]/normal_length; - } - - /*--- find the pressure at endpoint1 of this segment by interpolating - the pressures at the two nodes of the edge it sits on ---*/ - double pressure_endpoint1_p1, pressure_endpoint1_p2; - string input_file = "surface_flow.csv"; - unsigned short column = 6; - char convert_me[32]; - string entry; - - // for endpoint1, find the pressure at poi.nt1 - //sprintf(convert_me,"%d",point1[iSection].at(iSegment)); - //entry = string(convert_me); - //pressure_endpoint1_p1 = strtod(file_find(input_file, column, entry),NULL); - - // for endpoint1, find the pressure at point2 - //pressure_endpoint1_p2 = strtod(file_find(input_file, column, point1[iSection].at(iSegment+1)),NULL); - - - - - // for endpoint1, compute weight2 - - // using the two weights, interpolate to find the pressure at endpoint1, - // i.e. segments[iSegment].pressure_endpoint1 - - // rinse and repeat for endpoint2 - - //segments[iSegment].pressure_endpoint1 = (1.0/distance_total)*(distance_p2*pressure_endpoint1_p1 + distance_p1*pressure_endpoint1_p2); - - /*--- find the pressure at endpoint2 of this segment by interpolating - the pressures at the two nodes of the edge it sits on ---*/ - // segments[iSegment].pressure_endpoint2 = (1.0/distance_total)*(distance_p2*pressure_endpoint2_p1 + distance_p1*pressure_endpoint2_p2); - - /*--- find the value of pressure at the segment's midpoint - by averaging the values found at the endpoints ---*/ - //double midPressure = 0.5*(segments[iSegment].pressure_endpoint1 + segments[iSegment].pressure_endpoint2); - - /*--- find the force per unit length carried by the segment ---*/ - //double midForce = midPressure*segments[iSegment].length; - - /*--- create a vector associated with the force, pointing - in the direction of the inward-facing unit-normal ---*/ - //double force_vector [3]; - //for (iDim = 0; iDim < nDim; iDim++) { - // force_vector[iDim] = midForce*(-1.0*segments[iSegment].normal[iDim]); - //} - - - } // end loop over the segments - - - - - - - - } /*--- end loop over the sections ---*/ - - } /*--- end loop over the markers ---*/ - - - - /*--- delete the dynamically allocated memory ---*/ - if (Xcoord_Airfoil != NULL) delete [] Xcoord_Airfoil; - if (Ycoord_Airfoil != NULL) delete [] Ycoord_Airfoil; - if (Zcoord_Airfoil != NULL) delete [] Zcoord_Airfoil; - if (point1_Airfoil != NULL) delete [] point1_Airfoil; - if (point2_Airfoil != NULL) delete [] point2_Airfoil; - if (weight1_Airfoil != NULL) delete [] weight1_Airfoil; - if (normal_force != NULL) delete [] normal_force; - if (chord_force != NULL) delete [] chord_force; - if (pitching_moment != NULL) delete [] pitching_moment; - if (cl != NULL) delete [] cl; - if (cd != NULL) delete [] cd; - if (cm != NULL) delete [] cm; - - return 1; -} - -string file_find(string input_file, unsigned short column, string entry) { - - /*--- local variables ---*/ - fstream file; - string found_value, line; - char tmp[400]; - char *pointer_to; - unsigned short counter; - - /*--- initializations ---*/ - found_value = ""; - - /*--- check to make sure the file exists ---*/ - if (fexists(input_file.c_str()) == false) { - cout << endl; - cout << "*** ERROR! \"" << input_file << "\" does not exist! ***" << endl; - cout << "*** Please run mode 1 before running mode 2 ***" << endl; - found_value = "file not found!"; - return found_value; - } - - /*--- open the file ---*/ - file.open(input_file.c_str()); - - /*--- check if it opened ---*/ - if (file.is_open()) { - - /*--- start reading lines ---*/ - while (getline(file,line) && (found_value != "")) { - - /*--- turn the line into a char array ---*/ - strcpy(tmp,line.c_str()); - - /*--- start reading the line ---*/ - pointer_to = strtok(tmp," ,\r\n"); - - /*--- does it match what we want? ---*/ - if (pointer_to == entry) { - - /*--- read the rest of the line ---*/ - counter = 1; - while (pointer_to != NULL) { - - /*--- if it's the desired column ---*/ - if (counter == column) { - - /*--- record it ---*/ - found_value = pointer_to; - } - } - - /*--- if no vlaue assigned, print error ---*/ - if (found_value == "") { - cout << "SOMETHING WENT WRONG! "; - cout << "ENTRY FOUND BUT VALUE NOT ASSIGNED!" << endl; - } - } - } - - /*--- entry not found, print error ---*/ - if (found_value == "") { - cout << "SOMETHING WENT WRONG! "; - cout << "DESIRED ENTRY NOT FOUND!" << endl; - } - } - else - cout << "Oh no! Unable to open the \"" << input_file << "\" file!" << endl; - file.close(); - - return found_value; -} diff --git a/TestCases/README b/TestCases/README index 428016bad0f..f1e1ff83eda 100644 --- a/TestCases/README +++ b/TestCases/README @@ -2,6 +2,6 @@ The complete set of computational grids can be downloaded from the link below: http://su2.stanford.edu/download/v3.1.0/TestCases_3.1.0.tar.gz -Thanks for using SU^2! -The SU^2 Development Team +Thanks for using SU2! +The SU2 Development Team http://su2.stanford.edu \ No newline at end of file diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index b3f2332f087..febbc3bcbf7 100755 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -187,7 +187,7 @@ def do_adjust_iter(self): if __name__=="__main__": - '''This program runs SU^2 and ensures that the output matches specified values. This will be used to do nightly checks to make sure nothing is broken. ''' + '''This program runs SU2 and ensures that the output matches specified values. This will be used to do nightly checks to make sure nothing is broken. ''' # Build SU2_CFD in parallel using autoconf os.system('./configure --prefix=$SU2_HOME --with-MPI=mpicxx --with-Metis-lib=/home/ale11/tools/metis-5.0.1/lib --with-Metis-include=/home/ale11/tools/metis-5.0.1/include --with-Metis-version=5 CXXFLAGS="-O3"') @@ -199,8 +199,8 @@ def do_adjust_iter(self): print 'Could not build SU2_CFD' sys.exit(1) - if not os.path.exists("./SU2_DDC"): - print 'Could not build SU2_DDC' + if not os.path.exists("./SU2_PRT"): + print 'Could not build SU2_PRT' sys.exit(1) os.chdir(os.environ['SU2_HOME']) diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 85572194929..df0459a2652 100755 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -186,7 +186,7 @@ def do_adjust_iter(self): if __name__=="__main__": - '''This program runs SU^2 and ensures that the output matches specified values. This will be used to do nightly checks to make sure nothing is broken. ''' + '''This program runs SU2 and ensures that the output matches specified values. This will be used to do nightly checks to make sure nothing is broken. ''' # Build SU2_CFD in serial using autoconf os.system('./configure --prefix=$SU2_HOME CXXFLAGS="-O3"') diff --git a/config_template.cfg b/config_template.cfg index 91f6a104a20..f9d133e42d9 100644 --- a/config_template.cfg +++ b/config_template.cfg @@ -5,7 +5,7 @@ % Author: ___________________________________________________________________ % % Institution: ______________________________________________________________ % % Date: __________ % -% File Version 3.1.0 "eagle" % +% File Version 3.2.0 "eagle" % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/configure b/configure index 3ff09a69ac6..e275d237583 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for SU^2 3.1.0. +# Generated by GNU Autoconf 2.69 for SU2 3.1.0. # # Report bugs to . # @@ -578,10 +578,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='SU^2' -PACKAGE_TARNAME='SU^2' +PACKAGE_NAME='SU2' +PACKAGE_TARNAME='SU2' PACKAGE_VERSION='3.1.0' -PACKAGE_STRING='SU^2 3.1.0' +PACKAGE_STRING='SU2 3.1.0' PACKAGE_BUGREPORT='susquared-dev@lists.stanford.edu' PACKAGE_URL='http://su2.stanford.edu' @@ -625,22 +625,18 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -BUILD_UMC_FALSE -BUILD_UMC_TRUE -BUILD_GDC_FALSE -BUILD_GDC_TRUE +BUILD_GEO_FALSE +BUILD_GEO_TRUE BUILD_SOL_FALSE BUILD_SOL_TRUE -BUILD_PBC_FALSE -BUILD_PBC_TRUE -BUILD_MDC_FALSE -BUILD_MDC_TRUE -BUILD_MAC_FALSE -BUILD_MAC_TRUE -BUILD_GPC_FALSE -BUILD_GPC_TRUE -BUILD_DDC_FALSE -BUILD_DDC_TRUE +BUILD_DEF_FALSE +BUILD_DEF_TRUE +BUILD_MSH_FALSE +BUILD_MSH_TRUE +BUILD_DOT_FALSE +BUILD_DOT_TRUE +BUILD_PRT_FALSE +BUILD_PRT_TRUE BUILD_CFD_FALSE BUILD_CFD_TRUE JSONCPP_LD @@ -786,14 +782,12 @@ with_Mutationpp_include with_Jsoncpp_lib with_Jsoncpp_include enable_CFD -enable_DDC -enable_GPC -enable_MAC -enable_MDC -enable_PBC +enable_PRT +enable_DOT +enable_MSH +enable_DEF enable_SOL -enable_GDC -enable_UMC +enable_GEO ' ac_precious_vars='build_alias host_alias @@ -1347,7 +1341,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SU^2 3.1.0 to adapt to many kinds of systems. +\`configure' configures SU2 3.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1389,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/SU^2] + --docdir=DIR documentation root [DATAROOTDIR/doc/SU2] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1418,7 +1412,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SU^2 3.1.0:";; + short | recursive ) echo "Configuration of SU2 3.1.0:";; esac cat <<\_ACEOF @@ -1435,14 +1429,12 @@ Optional Features: --enable-tecio build with Tecplot TecIO API support (from source) --enable-metis build with Metis graph partitioning suppport --disable-CFD build the SU2_CFD executable (default = yes) - --disable-DDC build the SU2_DDC executable (default = yes) - --disable-GPC build the SU2_GPC executable (default = yes) - --disable-MAC build the SU2_MAC executable (default = yes) - --disable-MDC build the SU2_MDC executable (default = yes) - --disable-PBC build the SU2_PBC executable (default = yes) + --disable-PRT build the SU2_PRT executable (default = yes) + --disable-DOT build the SU2_DOT executable (default = yes) + --disable-MSH build the SU2_MSH executable (default = yes) + --disable-DEF build the SU2_DEF executable (default = yes) --disable-SOL build the SU2_SOL executable (default = yes) - --disable-GDC build the SU2_GDC executable (default = yes) - --disable-UMC build the SU2_UMC executable (default = yes) + --disable-GEO build the SU2_GEO executable (default = yes) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1480,7 +1472,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -SU^2 home page: . +SU2 home page: . _ACEOF ac_status=$? fi @@ -1543,7 +1535,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SU^2 configure 3.1.0 +SU2 configure 3.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2020,7 +2012,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SU^2 $as_me 3.1.0, which was +It was created by SU2 $as_me 3.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2955,7 +2947,7 @@ fi # Define the identity of the package. - PACKAGE='SU^2' + PACKAGE='SU2' VERSION='3.1.0' @@ -5579,39 +5571,32 @@ else build_CFD="yes" fi -# Check whether --enable-DDC was given. -if test "${enable_DDC+set}" = set; then : - enableval=$enable_DDC; build_DDC=$enableval +# Check whether --enable-PRT was given. +if test "${enable_PRT+set}" = set; then : + enableval=$enable_PRT; build_PRT=$enableval else - build_DDC="yes" + build_PRT="yes" fi -# Check whether --enable-GPC was given. -if test "${enable_GPC+set}" = set; then : - enableval=$enable_GPC; build_GPC=$enableval +# Check whether --enable-DOT was given. +if test "${enable_DOT+set}" = set; then : + enableval=$enable_DOT; build_DOT=$enableval else - build_GPC="yes" + build_DOT="yes" fi -# Check whether --enable-MAC was given. -if test "${enable_MAC+set}" = set; then : - enableval=$enable_MAC; build_MAC=$enableval +# Check whether --enable-MSH was given. +if test "${enable_MSH+set}" = set; then : + enableval=$enable_MSH; build_MSH=$enableval else - build_MAC="yes" + build_MSH="yes" fi -# Check whether --enable-MDC was given. -if test "${enable_MDC+set}" = set; then : - enableval=$enable_MDC; build_MDC=$enableval +# Check whether --enable-DEF was given. +if test "${enable_DEF+set}" = set; then : + enableval=$enable_DEF; build_DEF=$enableval else - build_MDC="yes" -fi - -# Check whether --enable-PBC was given. -if test "${enable_PBC+set}" = set; then : - enableval=$enable_PBC; build_PBC=$enableval -else - build_PBC="yes" + build_DEF="yes" fi # Check whether --enable-SOL was given. @@ -5621,18 +5606,11 @@ else build_SOL="yes" fi -# Check whether --enable-GDC was given. -if test "${enable_GDC+set}" = set; then : - enableval=$enable_GDC; build_GDC=$enableval -else - build_GDC="yes" -fi - -# Check whether --enable-UMC was given. -if test "${enable_UMC+set}" = set; then : - enableval=$enable_UMC; build_UMC=$enableval +# Check whether --enable-GEO was given. +if test "${enable_GEO+set}" = set; then : + enableval=$enable_GEO; build_GEO=$enableval else - build_UMC="yes" + build_GEO="yes" fi @@ -5963,44 +5941,36 @@ else BUILD_CFD_FALSE= fi - if test $build_DDC != "no"; then - BUILD_DDC_TRUE= - BUILD_DDC_FALSE='#' -else - BUILD_DDC_TRUE='#' - BUILD_DDC_FALSE= -fi - - if test $build_GPC != "no"; then - BUILD_GPC_TRUE= - BUILD_GPC_FALSE='#' + if test $build_PRT != "no"; then + BUILD_PRT_TRUE= + BUILD_PRT_FALSE='#' else - BUILD_GPC_TRUE='#' - BUILD_GPC_FALSE= + BUILD_PRT_TRUE='#' + BUILD_PRT_FALSE= fi - if test $build_MAC != "no"; then - BUILD_MAC_TRUE= - BUILD_MAC_FALSE='#' + if test $build_DOT != "no"; then + BUILD_DOT_TRUE= + BUILD_DOT_FALSE='#' else - BUILD_MAC_TRUE='#' - BUILD_MAC_FALSE= + BUILD_DOT_TRUE='#' + BUILD_DOT_FALSE= fi - if test $build_MDC != "no"; then - BUILD_MDC_TRUE= - BUILD_MDC_FALSE='#' + if test $build_MSH != "no"; then + BUILD_MSH_TRUE= + BUILD_MSH_FALSE='#' else - BUILD_MDC_TRUE='#' - BUILD_MDC_FALSE= + BUILD_MSH_TRUE='#' + BUILD_MSH_FALSE= fi - if test $build_PBC != "no"; then - BUILD_PBC_TRUE= - BUILD_PBC_FALSE='#' + if test $build_DEF != "no"; then + BUILD_DEF_TRUE= + BUILD_DEF_FALSE='#' else - BUILD_PBC_TRUE='#' - BUILD_PBC_FALSE= + BUILD_DEF_TRUE='#' + BUILD_DEF_FALSE= fi if test $build_SOL != "no"; then @@ -6011,26 +5981,18 @@ else BUILD_SOL_FALSE= fi - if test $build_GDC != "no"; then - BUILD_GDC_TRUE= - BUILD_GDC_FALSE='#' -else - BUILD_GDC_TRUE='#' - BUILD_GDC_FALSE= -fi - - if test $build_UMC != "no"; then - BUILD_UMC_TRUE= - BUILD_UMC_FALSE='#' + if test $build_GEO != "no"; then + BUILD_GEO_TRUE= + BUILD_GEO_FALSE='#' else - BUILD_UMC_TRUE='#' - BUILD_UMC_FALSE= + BUILD_GEO_TRUE='#' + BUILD_GEO_FALSE= fi ########################### -ac_config_files="$ac_config_files Makefile externals/Makefile Common/lib/Makefile SU2_CFD/obj/Makefile SU2_DDC/obj/Makefile SU2_GPC/obj/Makefile SU2_MAC/obj/Makefile SU2_MDC/obj/Makefile SU2_PBC/obj/Makefile SU2_SOL/obj/Makefile SU2_GDC/obj/Makefile SU2_UMC/obj/Makefile SU2_PY/Makefile" +ac_config_files="$ac_config_files Makefile externals/Makefile Common/lib/Makefile SU2_CFD/obj/Makefile SU2_PRT/obj/Makefile SU2_DOT/obj/Makefile SU2_MSH/obj/Makefile SU2_DEF/obj/Makefile SU2_SOL/obj/Makefile SU2_GEO/obj/Makefile SU2_PY/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6241,36 +6203,28 @@ if test -z "${BUILD_CFD_TRUE}" && test -z "${BUILD_CFD_FALSE}"; then as_fn_error $? "conditional \"BUILD_CFD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_DDC_TRUE}" && test -z "${BUILD_DDC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_DDC\" was never defined. +if test -z "${BUILD_PRT_TRUE}" && test -z "${BUILD_PRT_FALSE}"; then + as_fn_error $? "conditional \"BUILD_PRT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_GPC_TRUE}" && test -z "${BUILD_GPC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_GPC\" was never defined. +if test -z "${BUILD_DOT_TRUE}" && test -z "${BUILD_DOT_FALSE}"; then + as_fn_error $? "conditional \"BUILD_DOT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_MAC_TRUE}" && test -z "${BUILD_MAC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_MAC\" was never defined. +if test -z "${BUILD_MSH_TRUE}" && test -z "${BUILD_MSH_FALSE}"; then + as_fn_error $? "conditional \"BUILD_MSH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_MDC_TRUE}" && test -z "${BUILD_MDC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_MDC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_PBC_TRUE}" && test -z "${BUILD_PBC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_PBC\" was never defined. +if test -z "${BUILD_DEF_TRUE}" && test -z "${BUILD_DEF_FALSE}"; then + as_fn_error $? "conditional \"BUILD_DEF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_SOL_TRUE}" && test -z "${BUILD_SOL_FALSE}"; then as_fn_error $? "conditional \"BUILD_SOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_GDC_TRUE}" && test -z "${BUILD_GDC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_GDC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_UMC_TRUE}" && test -z "${BUILD_UMC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_UMC\" was never defined. +if test -z "${BUILD_GEO_TRUE}" && test -z "${BUILD_GEO_FALSE}"; then + as_fn_error $? "conditional \"BUILD_GEO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -6670,7 +6624,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SU^2 $as_me 3.1.0, which was +This file was extended by SU2 $as_me 3.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6722,13 +6676,13 @@ Configuration commands: $config_commands Report bugs to . -SU^2 home page: ." +SU2 home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -SU^2 config.status 3.1.0 +SU2 config.status 3.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6853,14 +6807,12 @@ do "externals/Makefile") CONFIG_FILES="$CONFIG_FILES externals/Makefile" ;; "Common/lib/Makefile") CONFIG_FILES="$CONFIG_FILES Common/lib/Makefile" ;; "SU2_CFD/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_CFD/obj/Makefile" ;; - "SU2_DDC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_DDC/obj/Makefile" ;; - "SU2_GPC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_GPC/obj/Makefile" ;; - "SU2_MAC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_MAC/obj/Makefile" ;; - "SU2_MDC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_MDC/obj/Makefile" ;; - "SU2_PBC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_PBC/obj/Makefile" ;; + "SU2_PRT/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_PRT/obj/Makefile" ;; + "SU2_DOT/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_DOT/obj/Makefile" ;; + "SU2_MSH/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_MSH/obj/Makefile" ;; + "SU2_DEF/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_DEF/obj/Makefile" ;; "SU2_SOL/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_SOL/obj/Makefile" ;; - "SU2_GDC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_GDC/obj/Makefile" ;; - "SU2_UMC/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_UMC/obj/Makefile" ;; + "SU2_GEO/obj/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_GEO/obj/Makefile" ;; "SU2_PY/Makefile") CONFIG_FILES="$CONFIG_FILES SU2_PY/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -7449,14 +7401,12 @@ Build Configuration Summary: External libs: $su2_externals_LIBS Build SU2_CFD: $build_CFD - Build SU2_DDC: $build_DDC - Build SU2_GPC: $build_GPC - Build SU2_MAC: $build_MAC - Build SU2_MDC: $build_MDC - Build SU2_PBC: $build_PBC + Build SU2_PRT: $build_PRT + Build SU2_DOT: $build_DOT + Build SU2_MSH: $build_MSH + Build SU2_DEF: $build_DEF Build SU2_SOL: $build_SOL - Build SU2_GDC: $build_GDC - Build SU2_UMC: $build_UMC + Build SU2_GEO: $build_GEO Please be sure to add the \$SU2_HOME and \$SU2_RUN environment variables, and update your \$PATH (and \$PYTHONPATH if applicable) with \$SU2_RUN. @@ -7491,14 +7441,12 @@ Build Configuration Summary: External libs: $su2_externals_LIBS Build SU2_CFD: $build_CFD - Build SU2_DDC: $build_DDC - Build SU2_GPC: $build_GPC - Build SU2_MAC: $build_MAC - Build SU2_MDC: $build_MDC - Build SU2_PBC: $build_PBC + Build SU2_PRT: $build_PRT + Build SU2_DOT: $build_DOT + Build SU2_MSH: $build_MSH + Build SU2_DEF: $build_DEF Build SU2_SOL: $build_SOL - Build SU2_GDC: $build_GDC - Build SU2_UMC: $build_UMC + Build SU2_GEO: $build_GEO Please be sure to add the \$SU2_HOME and \$SU2_RUN environment variables, and update your \$PATH (and \$PYTHONPATH if applicable) with \$SU2_RUN. diff --git a/configure.ac b/configure.ac index 5742da80127..ab67e6d6057 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# SU^2 autoconf file +# SU2 autoconf file # Stanford University Aerospace Design Lab # # Created: 10/26/12 @@ -12,8 +12,8 @@ # ########################## -AC_INIT([SU^2], [3.1.0], [susquared-dev@lists.stanford.edu], - [SU^2], [http://su2.stanford.edu]) +AC_INIT([SU2], [3.1.0], [susquared-dev@lists.stanford.edu], + [SU2], [http://su2.stanford.edu]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET @@ -99,30 +99,24 @@ AC_ARG_WITH(Jsoncpp-include, AC_ARG_ENABLE(CFD, AS_HELP_STRING([--disable-CFD], [build the SU2_CFD executable (default = yes)]), [build_CFD=$enableval], [build_CFD="yes"]) -AC_ARG_ENABLE(DDC, - AS_HELP_STRING([--disable-DDC], [build the SU2_DDC executable (default = yes)]), - [build_DDC=$enableval], [build_DDC="yes"]) -AC_ARG_ENABLE(GPC, - AS_HELP_STRING([--disable-GPC], [build the SU2_GPC executable (default = yes)]), - [build_GPC=$enableval], [build_GPC="yes"]) -AC_ARG_ENABLE(MAC, - AS_HELP_STRING([--disable-MAC], [build the SU2_MAC executable (default = yes)]), - [build_MAC=$enableval], [build_MAC="yes"]) -AC_ARG_ENABLE(MDC, - AS_HELP_STRING([--disable-MDC], [build the SU2_MDC executable (default = yes)]), - [build_MDC=$enableval], [build_MDC="yes"]) -AC_ARG_ENABLE(PBC, - AS_HELP_STRING([--disable-PBC], [build the SU2_PBC executable (default = yes)]), - [build_PBC=$enableval], [build_PBC="yes"]) +AC_ARG_ENABLE(PRT, + AS_HELP_STRING([--disable-PRT], [build the SU2_PRT executable (default = yes)]), + [build_PRT=$enableval], [build_PRT="yes"]) +AC_ARG_ENABLE(DOT, + AS_HELP_STRING([--disable-DOT], [build the SU2_DOT executable (default = yes)]), + [build_DOT=$enableval], [build_DOT="yes"]) +AC_ARG_ENABLE(MSH, + AS_HELP_STRING([--disable-MSH], [build the SU2_MSH executable (default = yes)]), + [build_MSH=$enableval], [build_MSH="yes"]) +AC_ARG_ENABLE(DEF, + AS_HELP_STRING([--disable-DEF], [build the SU2_DEF executable (default = yes)]), + [build_DEF=$enableval], [build_DEF="yes"]) AC_ARG_ENABLE(SOL, AS_HELP_STRING([--disable-SOL], [build the SU2_SOL executable (default = yes)]), [build_SOL=$enableval], [build_SOL="yes"]) -AC_ARG_ENABLE(GDC, - AS_HELP_STRING([--disable-GDC], [build the SU2_GDC executable (default = yes)]), - [build_GDC=$enableval], [build_GDC="yes"]) -AC_ARG_ENABLE(UMC, - AS_HELP_STRING([--disable-UMC], [build the SU2_UMC executable (default = yes)]), - [build_UMC=$enableval], [build_UMC="yes"]) +AC_ARG_ENABLE(GEO, + AS_HELP_STRING([--disable-GEO], [build the SU2_GEO executable (default = yes)]), + [build_GEO=$enableval], [build_GEO="yes"]) ########################## @@ -270,14 +264,12 @@ fi ########################### AM_CONDITIONAL([BUILD_CFD],[test $build_CFD != "no"]) -AM_CONDITIONAL([BUILD_DDC],[test $build_DDC != "no"]) -AM_CONDITIONAL([BUILD_GPC],[test $build_GPC != "no"]) -AM_CONDITIONAL([BUILD_MAC],[test $build_MAC != "no"]) -AM_CONDITIONAL([BUILD_MDC],[test $build_MDC != "no"]) -AM_CONDITIONAL([BUILD_PBC],[test $build_PBC != "no"]) +AM_CONDITIONAL([BUILD_PRT],[test $build_PRT != "no"]) +AM_CONDITIONAL([BUILD_DOT],[test $build_DOT != "no"]) +AM_CONDITIONAL([BUILD_MSH],[test $build_MSH != "no"]) +AM_CONDITIONAL([BUILD_DEF],[test $build_DEF != "no"]) AM_CONDITIONAL([BUILD_SOL],[test $build_SOL != "no"]) -AM_CONDITIONAL([BUILD_GDC],[test $build_GDC != "no"]) -AM_CONDITIONAL([BUILD_UMC],[test $build_UMC != "no"]) +AM_CONDITIONAL([BUILD_GEO],[test $build_GEO != "no"]) ########################### @@ -285,14 +277,12 @@ AC_OUTPUT(Makefile \ externals/Makefile \ Common/lib/Makefile \ SU2_CFD/obj/Makefile \ - SU2_DDC/obj/Makefile \ - SU2_GPC/obj/Makefile \ - SU2_MAC/obj/Makefile \ - SU2_MDC/obj/Makefile \ - SU2_PBC/obj/Makefile \ + SU2_PRT/obj/Makefile \ + SU2_DOT/obj/Makefile \ + SU2_MSH/obj/Makefile \ + SU2_DEF/obj/Makefile \ SU2_SOL/obj/Makefile \ - SU2_GDC/obj/Makefile \ - SU2_UMC/obj/Makefile \ + SU2_GEO/obj/Makefile \ SU2_PY/Makefile) abs_srcdir=`(cd $srcdir && pwd)` @@ -321,14 +311,12 @@ Build Configuration Summary: External libs: $su2_externals_LIBS Build SU2_CFD: $build_CFD - Build SU2_DDC: $build_DDC - Build SU2_GPC: $build_GPC - Build SU2_MAC: $build_MAC - Build SU2_MDC: $build_MDC - Build SU2_PBC: $build_PBC + Build SU2_PRT: $build_PRT + Build SU2_DOT: $build_DOT + Build SU2_MSH: $build_MSH + Build SU2_DEF: $build_DEF Build SU2_SOL: $build_SOL - Build SU2_GDC: $build_GDC - Build SU2_UMC: $build_UMC + Build SU2_GEO: $build_GEO Please be sure to add the [\$]SU2_HOME and [\$]SU2_RUN environment variables, and update your [\$]PATH (and [\$]PYTHONPATH if applicable) with [\$]SU2_RUN. diff --git a/externals/autotools/share/autoconf/autoconf/autoconf.m4f b/externals/autotools/share/autoconf/autoconf/autoconf.m4f index 7e612019a5e..429b6d7726b 100644 --- a/externals/autotools/share/autoconf/autoconf/autoconf.m4f +++ b/externals/autotools/share/autoconf/autoconf/autoconf.m4f @@ -1,11 +1,11 @@ -# This is a frozen state file generated by GNU M4 1.4.13 +# This is a frozen state file generated by GNU M4 1.4.6 V1 Q1,1 [] T28,27 -m4_location(AC_PROG_CXX_C_O)../../lib/autoconf/c.m4:779 +m4_location(AC_PROG_CXX_C_O)../../lib/autoconf/c.m4:803 T27,30 -m4_location(AC_LANG_ASSERT)../../lib/autoconf/lang.m4:156 +m4_location(AC_LANG_ASSERT)../../lib/autoconf/lang.m4:158 T22,133 _AS_LITERAL_HEREDOC_IFm4_if(m4_index([$1], [@S|@]), [-1], [m4_if(m4_index(m4_translit([[$1]], [\`], [$]), [$]), [-1], @@ -17,7 +17,7 @@ T27,54 AC_PATH_PROGS_FEATURE_CHECK_$0([$1], [$2], [$3], m4_default([$4], [:]), [$5])dnl T37,32 -m4_location(AC_ERLANG_SUBST_ROOT_DIR)../../lib/autoconf/erlang.m4:217 +m4_location(AC_ERLANG_SUBST_ROOT_DIR)../../lib/autoconf/erlang.m4:236 T16,400 _AS_EXIT_PREPARE_m4_defun_pro([$0])AS_REQUIRE_SHELL_FN([as_fn_set_status], [AS_FUNCTION_DESCRIBE([as_fn_set_status], [STATUS], @@ -165,17 +165,17 @@ AC_AIX_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_AIX' is obsolete You should run autoupdate.])dnl AC_USE_SYSTEM_EXTENSIONS[]_m4_defun_epi([$0]) T31,31 -m4_location(AC_ERLANG_PATH_ERL)../../lib/autoconf/erlang.m4:73 +m4_location(AC_ERLANG_PATH_ERL)../../lib/autoconf/erlang.m4:81 T17,0 AS_MESSAGE_LOG_FD T28,68 AC_LANG_PREPROC(Objective C)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_OBJCPP])[]_m4_defun_epi([$0]) T24,33 -m4_location(_AC_PROG_FC)../../lib/autoconf/fortran.m4:323 +m4_location(_AC_PROG_FC)../../lib/autoconf/fortran.m4:351 T23,34 -m4_location(AC_TRY_CPP)../../lib/autoconf/general.m4:2529 +m4_location(AC_TRY_CPP)../../lib/autoconf/general.m4:2530 T34,33 -m4_location(AC_FC_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:737 +m4_location(AC_FC_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:742 T22,1406 AC_SYS_LONG_FILE_NAMES_m4_defun_pro([$0])AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names, [ac_cv_sys_long_file_names=yes @@ -210,9 +210,9 @@ if test $ac_cv_sys_long_file_names = yes; then fi []_m4_defun_epi([$0]) T27,36 -m4_location(_AC_FUNC_VFORK)../../lib/autoconf/functions.m4:1845 +m4_location(_AC_FUNC_VFORK)../../lib/autoconf/functions.m4:1939 T34,30 -m4_location(AC_LANG_FUNC_LINK_TRY)../../lib/autoconf/lang.m4:280 +m4_location(AC_LANG_FUNC_LINK_TRY)../../lib/autoconf/lang.m4:282 T29,212 _AC_CHECK_HEADER_PREPROC_BODY AS_LINENO_PUSH([$[]1]) AC_CACHE_CHECK([for $[]2], [$[]3], @@ -224,7 +224,7 @@ _AC_CHECK_HEADER_PREPROC_BODY AS_LINENO_PUSH([$[]1]) T18,65 AC_LANG_PREPROC(C)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_CPP])[]_m4_defun_epi([$0]) T26,34 -m4_location(_AC_DO_TOKENS)../../lib/autoconf/general.m4:2403 +m4_location(_AC_DO_TOKENS)../../lib/autoconf/general.m4:2405 T14,159 ac_cv_prog_gxx_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `ac_cv_prog_gxx' is obsolete. You should run autoupdate.])dnl @@ -292,9 +292,9 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then fi T26,33 -m4_location(_AC_PROG_FC_V)../../lib/autoconf/fortran.m4:581 +m4_location(_AC_PROG_FC_V)../../lib/autoconf/fortran.m4:603 T31,31 -m4_location(AC_ERLANG_NEED_ERL)../../lib/autoconf/erlang.m4:86 +m4_location(AC_ERLANG_NEED_ERL)../../lib/autoconf/erlang.m4:91 T17,1105 AC_FUNC_GETGROUPS_m4_defun_pro([$0])AC_REQUIRE([AC_TYPE_GETGROUPS])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl @@ -330,15 +330,15 @@ LIBS=$ac_save_LIBS T18,23 AC_DEFINE_UNQUOTED_AC_DEFINE_Q([_$0], $@) T27,30 -m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1122 +m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1125 T20,29 -m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:585 +m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:586 T24,33 m4_location(AC_TIMEZONE)../../lib/autoconf/oldnames.m4:80 T25,30 -m4_location(AC_PATH_XTRA)../../lib/autoconf/libs.m4:365 +m4_location(AC_PATH_XTRA)../../lib/autoconf/libs.m4:478 T28,32 -m4_location(AC_CHECK_HEADER)../../lib/autoconf/headers.m4:67 +m4_location(AC_CHECK_HEADER)../../lib/autoconf/headers.m4:72 T21,479 _AS_VAR_ARITH_PREPARE_m4_defun_pro([$0])AS_FUNCTION_DESCRIBE([as_fn_arith], [ARG...], [Perform arithmetic evaluation on the ARGs, and store the result in @@ -399,9 +399,9 @@ AC_LANG_CONFTEST(C++)cat confdefs.h - <<_ACEOF >conftest.$ac_ext $1 _ACEOF T22,30 -m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1090 +m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1092 T23,34 -m4_location(AC_FC_FUNC)../../lib/autoconf/fortran.m4:1121 +m4_location(AC_FC_FUNC)../../lib/autoconf/fortran.m4:1126 F5,5 ifdefifdef T20,113 @@ -410,11 +410,11 @@ _AC_ENABLE_IF_ACTIONm4_append_uniq([_AC_USER_OPTS], [$1_$2], [ AS_IF([test "${$1_$2+set}" = set], [$1val=$$1_$2; $3], [$4])dnl T28,33 -m4_location(_AC_INIT_SRCDIR)../../lib/autoconf/general.m4:510 +m4_location(_AC_INIT_SRCDIR)../../lib/autoconf/general.m4:545 T28,30 -m4_location(_AC_LANG_ABBREV)../../lib/autoconf/lang.m4:141 +m4_location(_AC_LANG_ABBREV)../../lib/autoconf/lang.m4:142 T28,31 -m4_location(AC_CHECK_SIZEOF)../../lib/autoconf/types.m4:773 +m4_location(AC_CHECK_SIZEOF)../../lib/autoconf/types.m4:791 T8,150 m4_defunm4_define([m4_location($1)], m4_location)m4_default([$3], [m4_define])([$1], [_m4_defun_pro(]m4_dquote($[0])[)$2[]_m4_defun_epi(]m4_dquote($[0])[)]) @@ -448,7 +448,7 @@ esac F6,6 syscmdsyscmd T30,33 -m4_location(_AC_LINKER_OPTION)../../lib/autoconf/fortran.m4:123 +m4_location(_AC_LINKER_OPTION)../../lib/autoconf/fortran.m4:131 T28,33 m4_location(AC_HAVE_HEADERS)../../lib/autoconf/oldnames.m4:35 T18,50 @@ -460,7 +460,7 @@ m4_patsubstm4_expand_once([m4_warn([syntax], [do not use m4_patsubst: use patsubst or m4_bpatsubst])])dnl patsubst($@) T34,34 -m4_location(_AC_LIBOBJS_NORMALIZE)../../lib/autoconf/general.m4:2949 +m4_location(_AC_LIBOBJS_NORMALIZE)../../lib/autoconf/general.m4:2965 T18,94 _m4_set_contents_2_m4_stack_reverse([_m4_set_($1)], [_m4_set([$1])], [$2[]_m4_defn([_m4_set_($1)])$3], [$4[]]) @@ -472,7 +472,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&AS_MESSAGE_LOG_FD && echo " T27,31 m4_location(AC_TYPE_SIZE_T)../../lib/autoconf/types.m4:602 T27,33 -m4_location(AC_HEADER_STAT)../../lib/autoconf/headers.m4:564 +m4_location(AC_HEADER_STAT)../../lib/autoconf/headers.m4:591 T8,81 m4_chompm4_format([[%.*s]], m4_index(m4_translit([[$1]], [ /.], [/ ])[./.], [/.]), [$1]) @@ -516,11 +516,11 @@ m4_ifset([AC_PACKAGE_BUGREPORT], T9,0 AN_OUTPUT T27,35 -m4_location(AC_FUNC_ALLOCA)../../lib/autoconf/functions.m4:362 +m4_location(AC_FUNC_ALLOCA)../../lib/autoconf/functions.m4:412 T30,34 -m4_location(AC_FC_LINE_LENGTH)../../lib/autoconf/fortran.m4:1486 +m4_location(AC_FC_LINE_LENGTH)../../lib/autoconf/fortran.m4:1536 T29,33 -m4_location(AC_CHECK_HEADERS)../../lib/autoconf/headers.m4:249 +m4_location(AC_CHECK_HEADERS)../../lib/autoconf/headers.m4:255 T23,103 AC_LANG_PREPROC(Erlang)_m4_defun_pro([$0])m4_warn([syntax], [$0: No preprocessor defined for ]_AC_LANG)[]_m4_defun_epi([$0]) @@ -661,9 +661,9 @@ AC_TYPE_INT32_T_m4_defun_pro([$0])_AC_TYPE_INT(32)[]_m4_defun_epi([$0]) T18,2 AC_LANG_SOURCE(Go)$1 T33,33 -m4_location(_AC_OUTPUT_MAIN_LOOP)../../lib/autoconf/status.m4:1599 +m4_location(_AC_OUTPUT_MAIN_LOOP)../../lib/autoconf/status.m4:1737 T24,30 -m4_location(AC_LANG_POP)../../lib/autoconf/lang.m4:107 +m4_location(AC_LANG_POP)../../lib/autoconf/lang.m4:115 T11,165 _m4_dumpdefm4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_builtin([dumpdef], [$1])], @@ -785,7 +785,7 @@ char *realloc (); AS_IF([test $ac_cv_func_realloc_0_nonnull = yes], [$1], [$2]) []_m4_defun_epi([$0]) T27,33 -m4_location(AC_PROG_FC_C_O)../../lib/autoconf/fortran.m4:475 +m4_location(AC_PROG_FC_C_O)../../lib/autoconf/fortran.m4:480 T29,33 m4_location(AC_PROGRAM_CHECK)../../lib/autoconf/oldnames.m4:41 T16,2 @@ -835,7 +835,7 @@ T15,267 _AC_CONFIG_FOOSm4_map_args_w([$2], [_AC_CONFIG_REGISTER([$1],], [, [$3])])m4_define([_AC_SEEN_CONFIG(ANY)])m4_define([_AC_SEEN_CONFIG($1)])_AC_CONFIG_COMMANDS_INIT([$4])ac_config_[]m4_tolower([$1])="$ac_config_[]m4_tolower([$1]) m4_if([$1], [COMMANDS], [$2], [m4_normalize([$2])])" T25,30 -m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1981 +m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1984 T14,441 AC_C_VARARRAYS_m4_defun_pro([$0]) AC_CACHE_CHECK([for variable-length arrays], @@ -858,7 +858,7 @@ T14,131 m4_set_add_allm4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1]) + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@)))) T31,36 -m4_location(AC_FUNC_STRERROR_R)../../lib/autoconf/functions.m4:1625 +m4_location(AC_FUNC_STRERROR_R)../../lib/autoconf/functions.m4:1660 F7,4 m4_incrincr F8,4 @@ -867,7 +867,7 @@ T33,36 AC_LANG_FUNC_LINK_TRY(Fortran 77)AC_LANG_PROGRAM([], [ call $1]) T28,34 -m4_location(_AC_COMPUTE_INT)../../lib/autoconf/general.m4:3074 +m4_location(_AC_COMPUTE_INT)../../lib/autoconf/general.m4:3081 T13,124 _m4_defun_prom4_ifdef([_m4_expansion_stack], [], [_m4_defun_pro_outer([$1])])m4_expansion_stack_push([$1])m4_pushdef([_m4_expanding($1)]) T15,114 @@ -881,7 +881,7 @@ T27,103 AC_LANG_PREPROC(Fortran 77)_m4_defun_pro([$0])m4_warn([syntax], [$0: No preprocessor defined for ]_AC_LANG)[]_m4_defun_epi([$0]) T27,30 -m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1793 +m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1800 T13,175 m4_defun_initm4_define([$1], [$3[]])m4_defun([$1], [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl @@ -893,7 +893,7 @@ _AS_ECHO_LOG_m4_defun_pro([$0])AS_REQUIRE([_AS_LINENO_PREPARE])[]_m4_popdef([$0] T14,110 AC_DIVERT_PUSHm4_divert_stack_push([$0], [$1])m4_pushdef([_m4_divert_diversion], [$1])_m4_divert_raw(_m4_divert([$1], [$2])) T29,33 -m4_location(AC_HEADER_DIRENT)../../lib/autoconf/headers.m4:485 +m4_location(AC_HEADER_DIRENT)../../lib/autoconf/headers.m4:500 T17,604 _AS_SHELL_FN_WORKas_fn_return () { (exit [$]1); } as_fn_success () { as_fn_return 0; } @@ -943,13 +943,13 @@ AC_C_FLEXIBLE_ARRAY_MEMBER_m4_defun_pro([$0]) fi []_m4_defun_epi([$0]) T34,33 -m4_location(__AC_FC_NAME_MANGLING)../../lib/autoconf/fortran.m4:924 +m4_location(__AC_FC_NAME_MANGLING)../../lib/autoconf/fortran.m4:996 T27,31 m4_location(AC_TYPE_MODE_T)../../lib/autoconf/types.m4:614 T20,34 -m4_location(AC_INIT)../../lib/autoconf/general.m4:1358 +m4_location(AC_INIT)../../lib/autoconf/general.m4:1363 T27,28 -m4_location(AC_C_VARARRAYS)../../lib/autoconf/c.m4:1882 +m4_location(AC_C_VARARRAYS)../../lib/autoconf/c.m4:1895 T21,97 m4_copyright_condensem4_text_wrap(m4_bpatsubst(m4_flatten([[$1]]), [(C)[- ,0-9]*\([1-9][0-9][0-9][0-9]\)], [(C) \1])) @@ -995,7 +995,7 @@ _AC_LANG_IO_PROGRAM(C++)AC_LANG_PROGRAM([@%:@include ], return ferror (f) || fclose (f) != 0; ]) T31,32 -m4_location(_AC_LIST_MEMBER_IF)../../lib/autoconf/fortran.m4:79 +m4_location(_AC_LIST_MEMBER_IF)../../lib/autoconf/fortran.m4:92 T17,203 m4_cr_not_Letters  !"#*%&'()$+,./0123456789:;<=>?@[\]^_`{|}~- @@ -1063,7 +1063,7 @@ ATEOF ERLCFLAGS="$ERLCFLAGS" ])])[]_m4_defun_epi([$0]) T30,34 -m4_location(AC_PREPROC_IFELSE)../../lib/autoconf/general.m4:2518 +m4_location(AC_PREPROC_IFELSE)../../lib/autoconf/general.m4:2520 T18,3219 AC_FUNC_GETLOADAVG_m4_defun_pro([$0])ac_have_func=no # yes means we've found a way to get the load average. @@ -1166,9 +1166,9 @@ AC_SUBST([$1])dnl _AC_ARG_VAR_PRECIOUS([$1])dnl []_m4_defun_epi([$0]) T30,31 -m4_location(AM_TYPE_PTRDIFF_T)../../lib/autoconf/types.m4:304 +m4_location(AM_TYPE_PTRDIFF_T)../../lib/autoconf/types.m4:305 T27,33 -m4_location(AC_HEADER_TIME)../../lib/autoconf/headers.m4:761 +m4_location(AC_HEADER_TIME)../../lib/autoconf/headers.m4:777 T21,1 _m4_divert(M4SH-INIT)6 T18,1 @@ -1241,9 +1241,9 @@ AS_IF([test "$cross_compiling" = yes], T12,66 m4_re_string[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]* T31,34 -m4_location(_AC_RUN_LOG_STDERR)../../lib/autoconf/general.m4:2315 +m4_location(_AC_RUN_LOG_STDERR)../../lib/autoconf/general.m4:2325 T24,33 -m4_location(AC_UNISTD_H)../../lib/autoconf/headers.m4:833 +m4_location(AC_UNISTD_H)../../lib/autoconf/headers.m4:834 T31,86 _AC_LANG_IO_PROGRAM(Fortran 77)AC_LANG_PROGRAM([], [dnl @@ -1305,7 +1305,7 @@ AC_TYPE_LONG_DOUBLE_WIDER_m4_defun_pro([$0]) T32,36 m4_location(AC_SETVBUF_REVERSED)../../lib/autoconf/functions.m4:1719 T25,34 -m4_location(AC_PATH_TOOL)../../lib/autoconf/programs.m4:198 +m4_location(AC_PATH_TOOL)../../lib/autoconf/programs.m4:214 T23,47 _AC_CONFIG_COMPUTE_DESTm4_format([[%.*s]], m4_index([$1:], [:]), [$1]) T18,676 @@ -1360,9 +1360,9 @@ ac_link='$GOC -o conftest$ac_exeext $GOFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&A ac_compiler_gnu=yes T31,30 -m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1167 +m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1213 T26,34 -m4_location(AC_RUN_IFELSE)../../lib/autoconf/general.m4:2748 +m4_location(AC_RUN_IFELSE)../../lib/autoconf/general.m4:2757 T25,1 _m4_divert(M4SH-SANITIZE)4 T10,120 @@ -1376,7 +1376,7 @@ __AC_FC_NAME_MANGLING AC_LANG_POP(Fortran 77)dnl []_m4_defun_epi([$0]) T29,29 -m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:568 +m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:577 T34,35 m4_location(AM_FUNC_ERROR_AT_LINE)../../lib/autoconf/functions.m4:501 T15,165 @@ -1514,7 +1514,7 @@ m4_PACKAGE_YEAR2012 T44,34 m4_location(AC_VALIDATE_CACHED_SYSTEM_TUPLE)../../lib/autoconf/general.m4:1865 T30,33 -m4_location(AC_PREFIX_PROGRAM)../../lib/autoconf/general.m4:463 +m4_location(AC_PREFIX_PROGRAM)../../lib/autoconf/general.m4:473 T10,211 m4_dumpdefm4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_ifdef([$1], [m4_errprintn( @@ -1583,7 +1583,7 @@ AC_SUBST([FC_DEFINE])dnl AC_LANG_POP([Fortran])dnl []_m4_defun_epi([$0]) T23,29 -m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:385 +m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:389 F6,3 m4_lenlen T14,42 @@ -1627,7 +1627,7 @@ _AC_FC_LIBRARY_LDFLAGS AC_LANG_POP(Fortran 77)dnl []_m4_defun_epi([$0]) T29,30 -m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1223 +m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1250 T12,4697 AC_PATH_XTRA_m4_defun_pro([$0])AC_REQUIRE([AC_PATH_X])dnl if test "$no_x" = yes; then @@ -1743,9 +1743,9 @@ AC_SUBST(X_LIBS)dnl AC_SUBST(X_EXTRA_LIBS)dnl []_m4_defun_epi([$0]) T24,34 -m4_location(_AC_FC_FUNC)../../lib/autoconf/fortran.m4:1094 +m4_location(_AC_FC_FUNC)../../lib/autoconf/fortran.m4:1106 T30,34 -m4_location(AC_CONFIG_AUX_DIR)../../lib/autoconf/general.m4:1670 +m4_location(AC_CONFIG_AUX_DIR)../../lib/autoconf/general.m4:1671 F12,9 m4_debugmodedebugmode T10,280 @@ -1757,7 +1757,7 @@ m4_set_addm4_ifdef([_m4_set([$1],$2)], [1])m4_pushdef([_m4_set([$1])], [$2])_m4_set_size([$1], [m4_incr])$3]) T28,31 -m4_location(AC_LONG_64_BITS)../../lib/autoconf/types.m4:841 +m4_location(AC_LONG_64_BITS)../../lib/autoconf/types.m4:849 T14,549 _AC_RUN_IFELSE_m4_defun_pro([$0])AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_try_run], [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_try_run], [LINENO], @@ -1777,7 +1777,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu T24,34 -m4_location(AC_TRY_EVAL)../../lib/autoconf/general.m4:2452 +m4_location(AC_TRY_EVAL)../../lib/autoconf/general.m4:2453 T14,122 m4_append_uniqm4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [], [m4_warn([syntax], @@ -1843,13 +1843,13 @@ fi T19,92 AC_CHECK_DECLS_ONCE_m4_defun_pro([$0])m4_map_args_sep([_AC_CHECK_DECL_ONCE(], [)], [], $1)[]_m4_defun_epi([$0]) T27,30 -m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2066 +m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2068 T25,34 -m4_location(AC_PROG_YACC)../../lib/autoconf/programs.m4:894 +m4_location(AC_PROG_YACC)../../lib/autoconf/programs.m4:902 T27,1 _AC_LANG_PREFIX(Fortran 77)F T23,28 -m4_location(AC_PROG_GO)../../lib/autoconf/go.m4:150 +m4_location(AC_PROG_GO)../../lib/autoconf/go.m4:177 T32,0 m4_include(autoconf/programs.m4) T10,412 @@ -1865,7 +1865,7 @@ test_array @<:@0@:>@ = 0; return test_array @<:@0@:>@; ]) T37,33 -m4_location(_AC_CHECK_HEADER_COMPILE)../../lib/autoconf/headers.m4:162 +m4_location(_AC_CHECK_HEADER_COMPILE)../../lib/autoconf/headers.m4:173 T33,34 m4_location(AC_CHECK_TOOL_PREFIX)../../lib/autoconf/programs.m4:183 T17,92 @@ -1874,7 +1874,7 @@ _AC_COMPILE_IFELSE($@)[]_m4_defun_epi([$0]) T20,20 m4_PACKAGE_BUGREPORTbug-autoconf@gnu.org T27,34 -m4_location(AC_ARG_PROGRAM)../../lib/autoconf/general.m4:1636 +m4_location(AC_ARG_PROGRAM)../../lib/autoconf/general.m4:1654 T18,268 _AC_INIT_COPYRIGHTAC_COPYRIGHT(m4_defn([_AC_COPYRIGHT_YEARS]), [VERSION_FSF], [ m4_copyright_condense])dnl @@ -1911,9 +1911,9 @@ dnl # for best performing tool in a list breaks down. rm -f conftest.in conftest.tmp conftest.nl conftest.out])dnl T24,34 -m4_location(AC_PROG_AWK)../../lib/autoconf/programs.m4:349 +m4_location(AC_PROG_AWK)../../lib/autoconf/programs.m4:350 T31,34 -m4_location(AC_FC_CHECK_BOUNDS)../../lib/autoconf/fortran.m4:1564 +m4_location(AC_FC_CHECK_BOUNDS)../../lib/autoconf/fortran.m4:1616 T19,700 AC_TYPE_LONG_DOUBLE_m4_defun_pro([$0]) AC_CACHE_CHECK([for long double], [ac_cv_type_long_double], @@ -2063,7 +2063,7 @@ m4_ifdef([_m4_diverting([AC_PROG_INSTALL])], [-]), [-], [[m4_unquote(], [)]], T17,70 AC_CONFIG_HEADERS_m4_defun_pro([$0])_AC_CONFIG_FOOS([HEADERS], $@)[]_m4_defun_epi([$0]) T32,35 -m4_location(AC_CHECK_FUNCS_ONCE)../../lib/autoconf/functions.m4:107 +m4_location(AC_CHECK_FUNCS_ONCE)../../lib/autoconf/functions.m4:108 T8,66 m4_ifsetm4_ifdef([$1], [m4_ifval(_m4_defn([$1]), [$2], [$3])], @@ -2088,7 +2088,7 @@ T17,41 AC_PROVIDE_IFELSEm4_ifdef([m4_provide($1)], [$2], [$3]) T27,28 -m4_location(AC_C_BIGENDIAN)../../lib/autoconf/c.m4:1444 +m4_location(AC_C_BIGENDIAN)../../lib/autoconf/c.m4:1608 T12,30 m4_esyscmd_sm4_chomp_all(m4_esyscmd([$1])) T6,264 @@ -2116,7 +2116,7 @@ _m4_append_uniqm4_ifdef([$1], [m4_append([$1], [$2], [$3])$4], [$5])], [m4_define([$1], [$2])$4]) T32,30 -m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1296 +m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1309 T32,0 m4_include(autoconf/autoscan.m4) T20,201 @@ -2137,7 +2137,7 @@ AC_TEST_PROGRAM_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_TEST_PR You should run autoupdate.])dnl m4_if($#, 0, [AC_TRY_RUN], [AC_TRY_RUN($@)])[]_m4_defun_epi([$0]) T33,34 -m4_location(AC_CONFIG_LIBOBJ_DIR)../../lib/autoconf/general.m4:2907 +m4_location(AC_CONFIG_LIBOBJ_DIR)../../lib/autoconf/general.m4:2908 T17,272 _AS_IDENTIFIER_IFm4_cond([[$1]], [], [], [m4_eval(m4_len(m4_translit([[$1]], ][[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]][)) > 0)], [1], [], @@ -2256,9 +2256,9 @@ AC_PROGRAMS_PATH_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_PROGRA You should run autoupdate.])dnl m4_if($#, 0, [AC_PATH_PROGS], [AC_PATH_PROGS($@)])[]_m4_defun_epi([$0]) T25,29 -m4_location(_AC_LANG_SET)../../lib/autoconf/lang.m4:81 +m4_location(_AC_LANG_SET)../../lib/autoconf/lang.m4:82 T27,34 -m4_location(AC_PROG_RANLIB)../../lib/autoconf/programs.m4:851 +m4_location(AC_PROG_RANLIB)../../lib/autoconf/programs.m4:852 T13,84 _AS_QUOTE_OLDm4_warn([obsolete], [back quotes and double quotes must not be escaped in: $1])$1 @@ -2302,18 +2302,18 @@ T9,72 m4_mapallm4_if([$2], [], [], [_m4_foreach([m4_apply([$1],], [)], [], $2)]) T37,33 -m4_location(AC_LANG_PREPROC(Fortran))../../lib/autoconf/fortran.m4:245 +m4_location(AC_LANG_PREPROC(Fortran))../../lib/autoconf/fortran.m4:247 F14,6 _m4_divert_rawdivert T13,71 AC_LIBSOURCES_m4_defun_pro([$0])m4_map_args([AC_LIBSOURCE], $1)[]_m4_defun_epi([$0]) T37,32 -m4_location(AC_ERLANG_SUBST_ERTS_VER)../../lib/autoconf/erlang.m4:301 +m4_location(AC_ERLANG_SUBST_ERTS_VER)../../lib/autoconf/erlang.m4:320 T12,94 AH_CHECK_LIBAH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]), [Define to 1 if you have the `$1' library (-l$1).]) T40,33 -m4_location(AC_LANG_PREPROC(Fortran 77))../../lib/autoconf/fortran.m4:238 +m4_location(AC_LANG_PREPROC(Fortran 77))../../lib/autoconf/fortran.m4:240 T6,122 m4_cdrm4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], [$#], 1, [], @@ -2491,9 +2491,9 @@ ac_ext=$ac_save_ext _AC_PROG_FC_G []_m4_defun_epi([$0]) T29,33 -m4_location(AC_HEADER_ASSERT)../../lib/autoconf/headers.m4:437 +m4_location(AC_HEADER_ASSERT)../../lib/autoconf/headers.m4:452 T30,33 -m4_location(AC_HAVE_POUNDBANG)../../lib/autoconf/specific.m4:76 +m4_location(AC_HAVE_POUNDBANG)../../lib/autoconf/specific.m4:79 T23,60 AC_LANG_PROGRAM(Erlang)[-module(conftest). -export([start/0]).] @@ -2565,7 +2565,7 @@ m4_popdefm4_if([$#], [0], [[$0]], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)]) T21,29 -m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:671 +m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:672 T22,2800 _AC_FC_LIBRARY_LDFLAGS_m4_defun_pro([$0])AC_REQUIRE([AC_CANONICAL_HOST])dnl _AC_FORTRAN_ASSERT()dnl @@ -2656,7 +2656,7 @@ fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" AC_SUBST([]_AC_LANG_PREFIX[]LIBS) []_m4_defun_epi([$0]) T31,34 -m4_location(_AC_PREPROC_IFELSE)../../lib/autoconf/general.m4:2503 +m4_location(_AC_PREPROC_IFELSE)../../lib/autoconf/general.m4:2511 F5,5 indirindir T19,572 @@ -2738,11 +2738,11 @@ AC_HAVE_FUNCS_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_HAVE_FUNC You should run autoupdate.])dnl m4_if($#, 0, [AC_CHECK_FUNCS], [AC_CHECK_FUNCS($@)])[]_m4_defun_epi([$0]) T31,29 -m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:807 +m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:820 T28,33 m4_location(AM_PROG_INSTALL)../../lib/autoconf/oldnames.m4:92 T30,30 -m4_location(AC_NO_EXECUTABLES)../../lib/autoconf/lang.m4:406 +m4_location(AC_NO_EXECUTABLES)../../lib/autoconf/lang.m4:437 T24,23 _AC_LANG_NULL_PROGRAM(C)AC_LANG_PROGRAM([], []) T19,295 @@ -2757,15 +2757,15 @@ AC_CHECK_DECLS([sys_siglist],,, ]) []_m4_defun_epi([$0]) T27,29 -m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:894 +m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:895 T31,35 -m4_location(AC_REPLACE_FNMATCH)../../lib/autoconf/functions.m4:573 +m4_location(AC_REPLACE_FNMATCH)../../lib/autoconf/functions.m4:577 T29,30 -m4_location(AC_LANG_INT_SAVE)../../lib/autoconf/lang.m4:297 +m4_location(AC_LANG_INT_SAVE)../../lib/autoconf/lang.m4:298 T28,28 -m4_location(AC_PROG_CC_STDC)../../lib/autoconf/c.m4:1378 +m4_location(AC_PROG_CC_STDC)../../lib/autoconf/c.m4:1391 T26,28 -m4_location(AC_C_RESTRICT)../../lib/autoconf/c.m4:1739 +m4_location(AC_C_RESTRICT)../../lib/autoconf/c.m4:1776 T11,498 _AS_MKDIR_Pcase $as_dir in #( -*) as_dir=./$as_dir;; @@ -2791,7 +2791,7 @@ AC_PROGRAMS_CHECK_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_PROGR You should run autoupdate.])dnl m4_if($#, 0, [AC_CHECK_PROGS], [AC_CHECK_PROGS($@)])[]_m4_defun_epi([$0]) T39,30 -m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1315 +m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1324 T5,73 m4_dom4_if([$#], 0, [], [$#], 1, [$1[]], @@ -2803,9 +2803,9 @@ m4_if($#, 0, [AC_FUNC_STRCOLL], [AC_FUNC_STRCOLL($@)])[]_m4_defun_epi([$0]) F9,6 m4_substrsubstr T33,29 -m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:167 +m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:168 T34,33 -m4_location(AC_CHECK_HEADERS_ONCE)../../lib/autoconf/headers.m4:273 +m4_location(AC_CHECK_HEADERS_ONCE)../../lib/autoconf/headers.m4:274 T18,8 m4_PACKAGE_TARNAMEautoconf T14,87 @@ -2897,9 +2897,9 @@ AC_FUNC_STRTOLD_m4_defun_pro([$0]) T21,90 AC_CHECK_HEADERS_ONCE_m4_defun_pro([$0])m4_map_args_w([$1], [_AC_CHECK_HEADER_ONCE(], [)])[]_m4_defun_epi([$0]) T27,30 -m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1878 +m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1879 T26,34 -m4_location(AC_PROG_EGREP)../../lib/autoconf/programs.m4:355 +m4_location(AC_PROG_EGREP)../../lib/autoconf/programs.m4:365 T18,3540 _AC_OUTPUT_SUBDIRS # @@ -3033,7 +3033,7 @@ AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), [The size of `$1', as computed by sizeof.]) []_m4_defun_epi([$0]) T30,34 -m4_location(AC_FC_MODULE_FLAG)../../lib/autoconf/fortran.m4:1752 +m4_location(AC_FC_MODULE_FLAG)../../lib/autoconf/fortran.m4:1800 T15,58 m4_divert_stackm4_stack_foreach_sep_lifo([_m4_divert_stack], [], [], [ ]) @@ -3043,9 +3043,9 @@ AC_REQUIRE_AUX_FILEAS_LITERAL_WORD_IF([$1], [], T17,31 m4_default_quotedm4_if([$1], [], [[$2]], [[$1]]) T27,34 -m4_location(_AC_RUN_IFELSE)../../lib/autoconf/general.m4:2729 +m4_location(_AC_RUN_IFELSE)../../lib/autoconf/general.m4:2739 T29,27 -m4_location(_AC_ARG_VAR_LIBS)../../lib/autoconf/c.m4:328 +m4_location(_AC_ARG_VAR_LIBS)../../lib/autoconf/c.m4:330 T11,88 AH_VERBATIMAS_LITERAL_WORD_IF([$1], [AH_OUTPUT(_m4_expand([$1]), AS_ESCAPE([[$2]], [\']))]) @@ -3104,7 +3104,7 @@ AS_VAR_PUSHDEF_m4_defun_pro([$0])AS_REQUIRE([_AS_TR_SH_PREPARE])[]_m4_popdef([$0 T12,21 AC_LANG_CASEm4_case(_AC_LANG, $@) T18,29 -m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:639 +m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:643 T26,33 m4_location(AC_ST_BLKSIZE)../../lib/autoconf/oldnames.m4:76 T15,470 @@ -3120,7 +3120,7 @@ AC_LANG_CONFTEST(Fortran 77)cat > conftest.$ac_ext <<_ACEOF AC_LANG_DEFINES_PROVIDED[]$1 _ACEOF T32,35 -m4_location(_AC_FUNC_FNMATCH_IF)../../lib/autoconf/functions.m4:508 +m4_location(_AC_FUNC_FNMATCH_IF)../../lib/autoconf/functions.m4:541 T21,33 m4_location(AC_UID_T)../../lib/autoconf/oldnames.m4:82 T31,33 @@ -3134,11 +3134,11 @@ AC_MSG_CHECKING{ _AS_ECHO_LOG([checking $1]) _AS_ECHO_N([checking $1... ]); }dnl T31,30 -m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1767 +m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1775 T31,36 -m4_location(AC_FUNC_UTIME_NULL)../../lib/autoconf/functions.m4:1749 +m4_location(AC_FUNC_UTIME_NULL)../../lib/autoconf/functions.m4:1774 T27,35 -m4_location(AC_FUNC_MALLOC)../../lib/autoconf/functions.m4:912 +m4_location(AC_FUNC_MALLOC)../../lib/autoconf/functions.m4:921 T14,97 AC_CHECK_FILES_m4_defun_pro([$0])m4_map_args_w([$1], [AC_CHECK_FILE(_$0(], [)[$2], [$3])])[]_m4_defun_epi([$0]) T17,733 @@ -3159,7 +3159,7 @@ _AC_CANONICAL_SPLIT([host]) m4_ifdef([_m4_diverting([AC_CANONICAL_HOST])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([AC_CANONICAL_HOST],], [, _m4_divert_dump)]])) T24,34 -m4_location(AC_TRY_LINK)../../lib/autoconf/general.m4:2687 +m4_location(AC_TRY_LINK)../../lib/autoconf/general.m4:2688 T17,109 _AC_LANG_DISPATCHm4_ifdef([$1($2)], [m4_indir([$1($2)], m4_shift2($@))], @@ -3167,7 +3167,7 @@ _AC_LANG_DISPATCHm4_ifdef([$1($2)], F9,6 m4_syscmdsyscmd T20,29 -m4_location(AC_LANG)../../lib/autoconf/lang.m4:88 +m4_location(AC_LANG)../../lib/autoconf/lang.m4:91 T16,116 _AC_ARG_VAR_LIBS_m4_defun_pro([$0])AC_ARG_VAR([LIBS], [libraries to pass to the linker, e.g. -l])[]_m4_defun_epi([$0]) @@ -3186,7 +3186,7 @@ fi AC_LANG_POP(Fortran)dnl []_m4_defun_epi([$0]) T30,33 -m4_location(AC_CONFIG_TESTDIR)../../lib/autoconf/autotest.m4:42 +m4_location(AC_CONFIG_TESTDIR)../../lib/autoconf/autotest.m4:77 T32,0 m4_include(autoconf/autotest.m4) T16,84 @@ -3601,7 +3601,7 @@ fi T9,22 m4_shift2m4_shift(m4_shift($@)) T23,28 -m4_location(AC_C_CONST)../../lib/autoconf/c.m4:1661 +m4_location(AC_C_CONST)../../lib/autoconf/c.m4:1721 T18,80 m4_expansion_stackm4_stack_foreach_sep_lifo([_$0], [_$0_entry(], [) ])m4_location[: the top level] @@ -3642,10 +3642,10 @@ m4_version_prereqm4_if(m4_version_compare([2.69], [$1]), [m4_fatal([Autoconf version $1 or higher is required], [63])])], [$2]) -T25,29 -m4_location(AC_LANG_PUSH)../../lib/autoconf/lang.m4:97 +T25,30 +m4_location(AC_LANG_PUSH)../../lib/autoconf/lang.m4:100 T25,36 -m4_location(AC_FUNC_MMAP)../../lib/autoconf/functions.m4:1201 +m4_location(AC_FUNC_MMAP)../../lib/autoconf/functions.m4:1349 T10,43 _AC_DEFINEAS_ECHO(["AS_ESCAPE([[$1]])"]) >>confdefs.h T24,33 @@ -3655,9 +3655,9 @@ _m4_list_cmp_rawm4_if([$1], [$2], [0], [_m4_list_cmp_1([$1], $2)]) T8,0 __unix__ T20,30 -m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1257 +m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1259 T30,34 -m4_location(AC_COMPILE_IFELSE)../../lib/autoconf/general.m4:2606 +m4_location(AC_COMPILE_IFELSE)../../lib/autoconf/general.m4:2608 T14,109 m4_file_appendm4_syscmd([cat >>$1 <<_m4eof $2 @@ -3687,7 +3687,7 @@ AC_LANG_POP(Fortran 77)dnl T15,49 m4_rename_forcem4_ifdef([$2], [_m4_undefine([$2])])m4_rename($@) T28,30 -m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1098 +m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1100 T13,110 _AC_ENABLE_IF@%:@ Check whether --$1-$2 was given. _AC_ENABLE_IF_ACTION([$1], m4_translit([$2], [-+.], [___]), [$3], [$4]) @@ -3724,7 +3724,7 @@ else fi []_m4_defun_epi([$0]) T29,32 -m4_location(AC_CONFIG_HEADER)../../lib/autoconf/status.m4:719 +m4_location(AC_CONFIG_HEADER)../../lib/autoconf/status.m4:720 T15,97 _AC_CHECK_FILES[$1], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1]), [1], [Define to 1 if you have the file `$1'.])] @@ -3757,9 +3757,9 @@ AC_CACHE_CHECK([for Erlang/OTP root directory], AC_SUBST([ERLANG_ROOT_DIR], [$ac_cv_erlang_root_dir]) []_m4_defun_epi([$0]) T32,31 -m4_location(AC_TYPE_LONG_DOUBLE)../../lib/autoconf/types.m4:389 +m4_location(AC_TYPE_LONG_DOUBLE)../../lib/autoconf/types.m4:409 T28,28 -m4_location(AC_C_PROTOTYPES)../../lib/autoconf/c.m4:1828 +m4_location(AC_C_PROTOTYPES)../../lib/autoconf/c.m4:1840 T9,222 m4_bmatchm4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], @@ -3797,11 +3797,11 @@ fi rm -f conftest.data []_m4_defun_epi([$0]) T28,34 -m4_location(_AC_FC_WRAPPERS)../../lib/autoconf/fortran.m4:1030 +m4_location(_AC_FC_WRAPPERS)../../lib/autoconf/fortran.m4:1066 T19,34 -m4_location(AC_RSH)../../lib/autoconf/programs.m4:858 +m4_location(AC_RSH)../../lib/autoconf/programs.m4:860 T29,31 -m4_location(AC_CHECK_ALIGNOF)../../lib/autoconf/types.m4:800 +m4_location(AC_CHECK_ALIGNOF)../../lib/autoconf/types.m4:803 T13,333 m4_divert_popm4_if([$1], [], [], [$1], _m4_defn([_m4_divert_diversion]), [], @@ -3832,7 +3832,7 @@ AC_ARG_VAR(YFLAGS, will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications.])[]_m4_defun_epi([$0]) T32,33 -m4_location(AC_REQUIRE_SHELL_FN)../../lib/autoconf/general.m4:181 +m4_location(AC_REQUIRE_SHELL_FN)../../lib/autoconf/general.m4:182 T9,190 AC_PREFIX_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_PREFIX' is obsolete. You should run autoupdate.])dnl @@ -3868,7 +3868,7 @@ AC_CHECK_HEADERS(string.h)[]_m4_defun_epi([$0]) T10,121 m4_re_word[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]* T42,27 -m4_location(_AC_PROG_PREPROC_WORKS_IFELSE)../../lib/autoconf/c.m4:345 +m4_location(_AC_PROG_PREPROC_WORKS_IFELSE)../../lib/autoconf/c.m4:378 T12,115 AC_COPYRIGHTAS_COPYRIGHT([$1])[]m4_divert_text(m4_default_quoted([$2], [VERSION_USER]), [m4_default([$3], [m4_newline])([$1])]) @@ -3883,13 +3883,13 @@ _AC_FC_FUNC([$1],[$2]) AC_LANG_POP(Fortran 77)dnl []_m4_defun_epi([$0]) T25,34 -m4_location(AC_PROG_GREP)../../lib/autoconf/programs.m4:388 +m4_location(AC_PROG_GREP)../../lib/autoconf/programs.m4:393 T27,35 -m4_location(AC_FUNC_MEMCMP)../../lib/autoconf/functions.m4:950 +m4_location(AC_FUNC_MEMCMP)../../lib/autoconf/functions.m4:981 T31,0 m4_include(autoconf/headers.m4) T27,34 -m4_location(AC_COMPUTE_INT)../../lib/autoconf/general.m4:3056 +m4_location(AC_COMPUTE_INT)../../lib/autoconf/general.m4:3068 T9,86 AH_BOTTOMm4_define([_AH_COUNTER], m4_incr(_AH_COUNTER))dnl AH_VERBATIM([zzzz]_AH_COUNTER, [$1]) @@ -3898,7 +3898,7 @@ m4_location(AC_TYPE_INT16_T)../../lib/autoconf/types.m4:625 T25,33 m4_location(AC_FIND_XTRA)../../lib/autoconf/oldnames.m4:58 T26,34 -m4_location(AC_CHECK_FILE)../../lib/autoconf/general.m4:2777 +m4_location(AC_CHECK_FILE)../../lib/autoconf/general.m4:2791 T34,292 _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTLAC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, @@ -3941,11 +3941,11 @@ AC_LANG_POP(C++)dnl T17,2 AC_LANG_SOURCE(C)$1 T33,33 -m4_location(_AC_CHECK_HEADER_NEW)../../lib/autoconf/headers.m4:220 +m4_location(_AC_CHECK_HEADER_NEW)../../lib/autoconf/headers.m4:223 T26,29 -m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:649 +m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:650 T27,34 -m4_location(AC_CHECK_FILES)../../lib/autoconf/general.m4:2808 +m4_location(AC_CHECK_FILES)../../lib/autoconf/general.m4:2809 T14,37 m4_PACKAGE_URLhttp://www.gnu.org/software/autoconf/ T11,62 @@ -4148,7 +4148,7 @@ m4_translittranslit T28,35 m4_location(fp_FUNC_FNMATCH)../../lib/autoconf/functions.m4:594 T27,34 -m4_location(AC_FC_FREEFORM)../../lib/autoconf/fortran.m4:1363 +m4_location(AC_FC_FREEFORM)../../lib/autoconf/fortran.m4:1395 T29,220 _AC_CHECK_HEADER_COMPILE_BODY AS_LINENO_PUSH([$[]1]) AC_CACHE_CHECK([for $[]2], [$[]3], @@ -4171,7 +4171,7 @@ m4_divert_pushm4_divert_stack_push([$0], [$1])m4_pushdef([_m4_divert_diversion], T21,95 _AC_LANG_NULL_PROGRAM_m4_defun_pro([$0])AC_LANG_SOURCE([_AC_LANG_DISPATCH([$0], _AC_LANG, $@)])[]_m4_defun_epi([$0]) T30,31 -m4_location(AC_TYPE_GETGROUPS)../../lib/autoconf/types.m4:259 +m4_location(AC_TYPE_GETGROUPS)../../lib/autoconf/types.m4:299 T8,87 m4_fatalm4_errprintn(m4_location[: error: $1] m4_expansion_stack)m4_exit(m4_if([$2],, 1, [$2])) @@ -4251,9 +4251,9 @@ ${ DEFS=`sed -n "$ac_script" confdefs.h` ] T26,31 -m4_location(AC_TYPE_UID_T)../../lib/autoconf/types.m4:590 +m4_location(AC_TYPE_UID_T)../../lib/autoconf/types.m4:598 T24,33 -m4_location(AC_F77_MAIN)../../lib/autoconf/fortran.m4:891 +m4_location(AC_F77_MAIN)../../lib/autoconf/fortran.m4:896 T20,98 _AC_LANG_OPENMP(C++) #ifndef _OPENMP @@ -4265,13 +4265,13 @@ int main () { return omp_get_num_threads (); } T27,2 AC_LANG_SOURCE(Objective C)$1 T24,34 -m4_location(_AC_DO_ECHO)../../lib/autoconf/general.m4:2350 +m4_location(_AC_DO_ECHO)../../lib/autoconf/general.m4:2371 T29,31 m4_location(AC_TYPE_UINT64_T)../../lib/autoconf/types.m4:631 T20,33 m4_location(AC_LN_S)../../lib/autoconf/oldnames.m4:62 T27,31 -m4_location(AC_INT_16_BITS)../../lib/autoconf/types.m4:829 +m4_location(AC_INT_16_BITS)../../lib/autoconf/types.m4:836 T16,225 _AS_LINENO_WORKS as_lineno_1=$LINENO as_lineno_1a=$LINENO as_lineno_2=$LINENO as_lineno_2a=$LINENO @@ -4349,19 +4349,19 @@ m4_wrap_m4_wrap([], [$1[]]) T16,9 _AS_TEST_X_WORKStest -x / T28,35 -m4_location(AC_FUNC_MBRTOWC)../../lib/autoconf/functions.m4:927 +m4_location(AC_FUNC_MBRTOWC)../../lib/autoconf/functions.m4:945 T25,34 -m4_location(AC_EGREP_CPP)../../lib/autoconf/general.m4:2538 +m4_location(AC_EGREP_CPP)../../lib/autoconf/general.m4:2550 T29,34 -m4_location(AC_COMPILE_CHECK)../../lib/autoconf/general.m4:2694 +m4_location(AC_COMPILE_CHECK)../../lib/autoconf/general.m4:2696 T26,36 -m4_location(_AC_FUNC_FORK)../../lib/autoconf/functions.m4:1829 +m4_location(_AC_FUNC_FORK)../../lib/autoconf/functions.m4:1840 T25,34 -m4_location(AC_XENIX_DIR)../../lib/autoconf/specific.m4:451 +m4_location(AC_XENIX_DIR)../../lib/autoconf/specific.m4:464 T26,34 -m4_location(AC_LIBSOURCES)../../lib/autoconf/general.m4:2920 +m4_location(AC_LIBSOURCES)../../lib/autoconf/general.m4:2921 T22,34 -m4_location(AC_LIBOBJ)../../lib/autoconf/general.m4:2938 +m4_location(AC_LIBOBJ)../../lib/autoconf/general.m4:2941 T12,110 _m4_set_sizem4_define([_m4_set_size($1)], m4_ifdef([_m4_set_size($1)], [$2(m4_indir([_m4_set_size($1)]))], @@ -4405,7 +4405,7 @@ AC_STRUCT_ST_BLOCKS_m4_defun_pro([$0])AC_CHECK_MEMBERS([struct stat.st_blocks], T6,43 m4_map_m4_foreach([_m4_apply([$1],], [)], [], $2) T28,34 -m4_location(AC_PROG_INSTALL)../../lib/autoconf/programs.m4:524 +m4_location(AC_PROG_INSTALL)../../lib/autoconf/programs.m4:612 T10,54 m4_includem4_include_unique([$1])dnl m4_builtin([include], [$1]) @@ -4583,9 +4583,9 @@ AC_CONFIG_SUBDIRS_m4_defun_pro([$0])AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])AC_RE T28,36 m4_location(AM_FUNC_OBSTACK)../../lib/autoconf/functions.m4:1385 T22,30 -m4_location(AC_PATH_X)../../lib/autoconf/libs.m4:323 +m4_location(AC_PATH_X)../../lib/autoconf/libs.m4:358 T36,33 -m4_location(AC_CONFIG_COMMANDS_POST)../../lib/autoconf/status.m4:1071 +m4_location(AC_CONFIG_COMMANDS_POST)../../lib/autoconf/status.m4:1073 T26,1 _m4_divert(HEADER-COMMENT)2 T26,688 @@ -4884,21 +4884,21 @@ _AC_FC_IMPLICIT_NONE($@) AC_LANG_POP([Fortran])dnl []_m4_defun_epi([$0]) T22,33 -m4_location(AC_PREREQ)../../lib/autoconf/general.m4:305 +m4_location(AC_PREREQ)../../lib/autoconf/general.m4:307 T28,35 -m4_location(AC_FUNC_FNMATCH)../../lib/autoconf/functions.m4:546 +m4_location(AC_FUNC_FNMATCH)../../lib/autoconf/functions.m4:551 T10,177 AM_MINGW32_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AM_MINGW32' is obsolete. You should run autoupdate.])dnl m4_if($#, 0, [AC_MINGW32], [AC_MINGW32($@)])[]_m4_defun_epi([$0]) T31,35 -m4_location(AC_FUNC_GETLOADAVG)../../lib/autoconf/functions.m4:715 +m4_location(AC_FUNC_GETLOADAVG)../../lib/autoconf/functions.m4:803 T11,150 AC_SCO_INTL_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_SCO_INTL' is obsolete. You should run autoupdate.])dnl AC_FUNC_STRFTIME[]_m4_defun_epi([$0]) T27,33 -m4_location(ac_cv_prog_g77)../../lib/autoconf/fortran.m4:268 +m4_location(ac_cv_prog_g77)../../lib/autoconf/fortran.m4:269 T23,36 m4_location(AC_VPRINTF)../../lib/autoconf/functions.m4:1966 T21,36 @@ -4927,19 +4927,19 @@ _AS_DIRNAME_SED_m4_defun_pro([$0])AS_ECHO([X[]$1]) | T25,33 m4_location(AC_ST_BLOCKS)../../lib/autoconf/oldnames.m4:77 T33,33 -m4_location(AC_HEADER_TIOCGWINSZ)../../lib/autoconf/headers.m4:819 +m4_location(AC_HEADER_TIOCGWINSZ)../../lib/autoconf/headers.m4:828 T17,94 _m4_stack_reversem4_ifdef([$1], [m4_pushdef([$2], _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4$3])]) T16,103 AS_IDENTIFIER_IFm4_if(_$0(m4_if(m4_index([$1], [@]), [-1], [[$1]], [m4_bpatsubst([[$1]], [@&t@])])), [-], [$2], [$3]) -F11,7 -m4_maketempmkstemp +F11,8 +m4_maketempmaketemp T30,34 -m4_location(_AC_RUN_LOG_LIMIT)../../lib/autoconf/general.m4:2332 +m4_location(_AC_RUN_LOG_LIMIT)../../lib/autoconf/general.m4:2344 T30,33 -m4_location(AC_F77_DUMMY_MAIN)../../lib/autoconf/fortran.m4:833 +m4_location(AC_F77_DUMMY_MAIN)../../lib/autoconf/fortran.m4:838 T17,129 _AS_DETECT_EXPAND$1="m4_bpatsubst(m4_dquote(AS_ESCAPE(_m4_expand(m4_set_contents([$2], [ ])))), [\\\$LINENO\(.*\)$], [";$1=$$1$LINENO;$1=$$1"\1])" @@ -4948,9 +4948,9 @@ AM_FUNC_FNMATCH_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AM_FUNC_FN You should run autoupdate.])dnl m4_if($#, 0, [AC_FUNC_FNMATCH], [AC_FUNC_FNMATCH($@)])[]_m4_defun_epi([$0]) T37,30 -m4_location(AC_LANG_COMPILER_REQUIRE)../../lib/autoconf/lang.m4:329 +m4_location(AC_LANG_COMPILER_REQUIRE)../../lib/autoconf/lang.m4:331 T27,33 -m4_location(AC_HEADER_STDC)../../lib/autoconf/headers.m4:677 +m4_location(AC_HEADER_STDC)../../lib/autoconf/headers.m4:729 T6,37 _AC_CC_AC_LANG_DISPATCH([$0], _AC_LANG, $@) T16,65 @@ -4968,9 +4968,9 @@ m4_nm4_if([$1], [$1 ]) T26,29 -m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:904 +m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:905 T27,27 -m4_location(AC_PROG_OBJCPP)../../lib/autoconf/c.m4:822 +m4_location(AC_PROG_OBJCPP)../../lib/autoconf/c.m4:847 T8,22 AS_TR_SH_$0(m4_expand([$1]))[] T8,124 @@ -4980,7 +4980,7 @@ m4_providem4_ifdef([m4_provide($1)], [], [m4_set_add([_m4_provide], [$1], [m4_define([m4_provide($1)], m4_ifdef([_m4_diverting], [_m4_defn([_m4_diverting])]))])]) T26,28 -m4_location(AC_C_VOLATILE)../../lib/autoconf/c.m4:1787 +m4_location(AC_C_VOLATILE)../../lib/autoconf/c.m4:1801 T18,209 AC_LONG_FILE_NAMES_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_LONG_FILE_NAMES' is obsolete. You should run autoupdate.])dnl @@ -4992,7 +4992,7 @@ AC_CYGWIN32_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_CYGWIN32' i You should run autoupdate.])dnl m4_if($#, 0, [AC_CYGWIN], [AC_CYGWIN($@)])[]_m4_defun_epi([$0]) T28,30 -m4_location(AC_HAVE_LIBRARY)../../lib/autoconf/libs.m4:137 +m4_location(AC_HAVE_LIBRARY)../../lib/autoconf/libs.m4:145 T13,100 AS_LINENO_POP_m4_defun_pro([$0])eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno[]_m4_defun_epi([$0]) T11,65 @@ -5002,7 +5002,7 @@ m4_ignore T28,33 m4_location(AC_STDC_HEADERS)../../lib/autoconf/oldnames.m4:75 T29,35 -m4_location(AC_TRY_LINK_FUNC)../../lib/autoconf/functions.m4:149 +m4_location(AC_TRY_LINK_FUNC)../../lib/autoconf/functions.m4:150 T20,184 _AC_FC_NAME_MANGLING_m4_defun_pro([$0])AC_REQUIRE([AC_FC_LIBRARY_LDFLAGS])dnl AC_REQUIRE([AC_FC_DUMMY_MAIN])dnl @@ -5069,19 +5069,19 @@ if test $ac_cv_func_chown_works = yes; then fi []_m4_defun_epi([$0]) T30,34 -m4_location(AC_CANONICAL_HOST)../../lib/autoconf/general.m4:1815 +m4_location(AC_CANONICAL_HOST)../../lib/autoconf/general.m4:1828 T9,28 _m4_quotem4_if([$#], [0], [], [[$*]]) T9,0 AU_DEFINE T28,34 -m4_location(AC_EGREP_HEADER)../../lib/autoconf/general.m4:2556 +m4_location(AC_EGREP_HEADER)../../lib/autoconf/general.m4:2559 T8,179 AC_ERROR_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_ERROR' is obsolete. You should run autoupdate.])dnl m4_if($#, 0, [AC_MSG_ERROR], [AC_MSG_ERROR($@)])[]_m4_defun_epi([$0]) T27,34 -m4_location(AC_TRY_COMMAND)../../lib/autoconf/general.m4:2461 +m4_location(AC_TRY_COMMAND)../../lib/autoconf/general.m4:2463 T9,184 AC_SIZE_T_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_SIZE_T' is obsolete. You should run autoupdate.])dnl @@ -5119,11 +5119,11 @@ static unsigned long int ulongval () { return $2; } return ferror (f) || fclose (f) != 0; ]) T21,30 -m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1826 +m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1828 T27,27 -m4_location(AC_PROG_CXXCPP)../../lib/autoconf/c.m4:636 +m4_location(AC_PROG_CXXCPP)../../lib/autoconf/c.m4:661 T32,32 -m4_location(AC_ERLANG_CHECK_LIB)../../lib/autoconf/erlang.m4:175 +m4_location(AC_ERLANG_CHECK_LIB)../../lib/autoconf/erlang.m4:211 T19,153 _AC_CONFIG_REGISTERm4_if([$1], [COMMANDS], [], @@ -5153,15 +5153,15 @@ _AC_FC_MAIN AC_LANG_POP(Fortran)dnl []_m4_defun_epi([$0]) T34,30 -m4_location(_AC_LANG_NULL_PROGRAM)../../lib/autoconf/lang.m4:256 +m4_location(_AC_LANG_NULL_PROGRAM)../../lib/autoconf/lang.m4:257 T24,33 m4_location(AC_CYGWIN32)../../lib/autoconf/oldnames.m4:86 T9,35 m4_shiftnm4_assert(0 < $1 && $1 < $#)_$0($@) T24,27 -m4_location(AC_PROG_CPP)../../lib/autoconf/c.m4:388 +m4_location(AC_PROG_CPP)../../lib/autoconf/c.m4:417 T23,27 -m4_location(AC_PROG_CC)../../lib/autoconf/c.m4:448 +m4_location(AC_PROG_CC)../../lib/autoconf/c.m4:496 T7,75 m4_warn_m4_warn([$1], [$2], m4_ifdef([_m4_expansion_stack], [m4_expansion_stack])) @@ -5214,9 +5214,9 @@ T16,110 AC_CHECK_MEMBERS_m4_defun_pro([$0])m4_map_args_sep([AC_CHECK_MEMBER(_$0(], [)[ $2], [$3], [$4])], [], $1)[]_m4_defun_epi([$0]) T30,31 -m4_location(AC_TYPE_MBSTATE_T)../../lib/autoconf/types.m4:567 +m4_location(AC_TYPE_MBSTATE_T)../../lib/autoconf/types.m4:582 T31,33 -m4_location(AC_OUTPUT_COMMANDS)../../lib/autoconf/status.m4:1026 +m4_location(AC_OUTPUT_COMMANDS)../../lib/autoconf/status.m4:1031 T16,245 m4_cr_not_digits  !"#*%&'()$+,./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~- @@ -5230,7 +5230,7 @@ AC_CACHE_VAL([ac_cv_func_setvbuf_reversed], [ac_cv_func_setvbuf_reversed=no]) T12,25 m4_set_listcm4_set_map_sep([$1], [,]) T27,36 -m4_location(AC_FUNC_STRTOD)../../lib/autoconf/functions.m4:1545 +m4_location(AC_FUNC_STRTOD)../../lib/autoconf/functions.m4:1584 T21,33 m4_location(AC_ERROR)../../lib/autoconf/oldnames.m4:34 T19,584 @@ -5277,13 +5277,13 @@ if test $ac_cv_func_$1_empty_string_bug = yes; then fi T30,30 -m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2121 +m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2140 T21,210 AM_FUNC_ERROR_AT_LINE_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AM_FUNC_ERROR_AT_LINE' is obsolete. You should run autoupdate.])dnl m4_if($#, 0, [AC_FUNC_ERROR_AT_LINE], [AC_FUNC_ERROR_AT_LINE($@)])[]_m4_defun_epi([$0]) T34,35 -m4_location(AC_FUNC_CLOSEDIR_VOID)../../lib/autoconf/functions.m4:460 +m4_location(AC_FUNC_CLOSEDIR_VOID)../../lib/autoconf/functions.m4:479 T21,76 _m4_set_add_all_checkm4_if([$#], [2], [], [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))]) @@ -5583,7 +5583,7 @@ AC_TYPE_UINTPTR_T_m4_defun_pro([$0]) done]) []_m4_defun_epi([$0]) T25,34 -m4_location(AC_CACHE_VAL)../../lib/autoconf/general.m4:2031 +m4_location(AC_CACHE_VAL)../../lib/autoconf/general.m4:2046 T31,443 _AC_SYS_LARGEFILE_TEST_INCLUDES@%:@include /* Check that off_t can represent 2**63 - 1 correctly. @@ -5611,7 +5611,7 @@ T26,96 AC_DISABLE_OPTION_CHECKING_m4_defun_pro([$0])m4_divert_once([DEFAULTS], [enable_option_checking=no]) []_m4_defun_epi([$0]) T23,34 -m4_location(_AC_DO_VAR)../../lib/autoconf/general.m4:2395 +m4_location(_AC_DO_VAR)../../lib/autoconf/general.m4:2396 T34,0 m4_include(autoconf/autoheader.m4) T24,1 @@ -5624,7 +5624,7 @@ T10,3 m4_newline $1 T28,30 -m4_location(AC_LANG_PROGRAM)../../lib/autoconf/lang.m4:241 +m4_location(AC_LANG_PROGRAM)../../lib/autoconf/lang.m4:242 T15,77 _AC_LANG_PREFIX_m4_defun_pro([$0])_AC_LANG_DISPATCH([$0], _AC_LANG, $@)[]_m4_defun_epi([$0]) T37,125 @@ -6003,10 +6003,10 @@ fi []_m4_defun_epi([$0]) T19,40 AC_CONFIG_MACRO_DIR_m4_defun_pro([$0])[]_m4_defun_epi([$0]) -F10,7 -m4_mkstempmkstemp +F10,8 +m4_mkstempmaketemp T31,35 -m4_location(_AC_LIBOBJ_FNMATCH)../../lib/autoconf/functions.m4:557 +m4_location(_AC_LIBOBJ_FNMATCH)../../lib/autoconf/functions.m4:568 T32,0 m4_include(autoconf/specific.m4) T16,73 @@ -6046,9 +6046,9 @@ static unsigned long int ulongval () { return $2; } return ferror (f) || fclose (f) != 0; ]) T26,34 -m4_location(_AC_PATH_PROG)../../lib/autoconf/programs.m4:120 +m4_location(_AC_PATH_PROG)../../lib/autoconf/programs.m4:150 T29,28 -m4_location(AC_C_BACKSLASH_A)../../lib/autoconf/c.m4:1396 +m4_location(AC_C_BACKSLASH_A)../../lib/autoconf/c.m4:1414 T19,2 _AC_LANG_PREFIX(Go)GO T9,184 @@ -6077,7 +6077,7 @@ __program____program__ T6,26 AS_BOX_$0(m4_expand([$1]), [$2]) T28,36 -m4_location(AC_FUNC_REALLOC)../../lib/autoconf/functions.m4:1417 +m4_location(AC_FUNC_REALLOC)../../lib/autoconf/functions.m4:1426 T7,156 m4_defnm4_if([$#], [0], [[$0]], [$#], [1], [m4_ifdef([$1], [_m4_defn([$1])], @@ -6088,9 +6088,9 @@ fp_FUNC_FNMATCH_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `fp_FUNC_FN You should run autoupdate.])dnl m4_if($#, 0, [AC_FUNC_FNMATCH], [AC_FUNC_FNMATCH($@)])[]_m4_defun_epi([$0]) T28,28 -m4_location(_AC_PROG_CC_C89)../../lib/autoconf/c.m4:1101 +m4_location(_AC_PROG_CC_C89)../../lib/autoconf/c.m4:1156 T28,36 -m4_location(AC_FUNC_OBSTACK)../../lib/autoconf/functions.m4:1362 +m4_location(AC_FUNC_OBSTACK)../../lib/autoconf/functions.m4:1380 T11,544 _AS_PREPARE_m4_defun_pro([$0])m4_pushdef([AS_REQUIRE])m4_pushdef([AS_REQUIRE_SHELL_FN], _m4_defn([_AS_REQUIRE_SHELL_FN]) )m4_pushdef([AS_MESSAGE_LOG_FD], [-1])_AS_ERROR_PREPARE @@ -6138,9 +6138,9 @@ m4_location(AC_ST_RDEV)../../lib/autoconf/oldnames.m4:78 T33,33 m4_location(AC_F77_NAME_MANGLING)../../lib/autoconf/fortran.m4:999 T27,28 -m4_location(AC_C_STRINGIZE)../../lib/autoconf/c.m4:1808 +m4_location(AC_C_STRINGIZE)../../lib/autoconf/c.m4:1821 T24,34 -m4_location(AC_CHECKING)../../lib/autoconf/general.m4:2266 +m4_location(AC_CHECKING)../../lib/autoconf/general.m4:2267 T6,4 m4_car[$1] T21,196 @@ -6252,7 +6252,7 @@ fi])dnl T14,62 m4_set_foreachm4_pushdef([$2])m4_set_map_sep([$1], [m4_define([$2],], [)$3]) T30,33 -m4_location(_AC_FC_DUMMY_MAIN)../../lib/autoconf/fortran.m4:779 +m4_location(_AC_FC_DUMMY_MAIN)../../lib/autoconf/fortran.m4:828 T11,190 AC_SET_MAKE_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_SET_MAKE' is obsolete. You should run autoupdate.])dnl @@ -6269,7 +6269,7 @@ AC_SEARCH_LIBS([strerror], [cposix])[]_m4_defun_epi([$0]) T16,101 m4_stack_foreach_m4_stack_reverse([$1], [m4_tmp-$1])_m4_stack_reverse([m4_tmp-$1], [$1], [$2(_m4_defn([m4_tmp-$1]))]) T26,34 -m4_location(AC_PATH_PROGS)../../lib/autoconf/programs.m4:164 +m4_location(AC_PATH_PROGS)../../lib/autoconf/programs.m4:171 T12,77 m4_chomp_allm4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ /], [/ ]), [/*$]), [$1]) @@ -6278,7 +6278,7 @@ AC_LN_S_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_LN_S' is obsole You should run autoupdate.])dnl m4_if($#, 0, [AC_PROG_LN_S], [AC_PROG_LN_S($@)])[]_m4_defun_epi([$0]) T19,33 -m4_location(AC_USG)../../lib/autoconf/headers.m4:840 +m4_location(AC_USG)../../lib/autoconf/headers.m4:852 T6,46 m4_cmpm4_eval((([$1]) > ([$2])) - (([$1]) < ([$2]))) T9,373 @@ -6316,9 +6316,9 @@ AC_FUNC_MBRTOWC_m4_defun_pro([$0]) T31,33 m4_location(AC_WORDS_BIGENDIAN)../../lib/autoconf/oldnames.m4:83 T28,34 -m4_location(AC_PROG_MKDIR_P)../../lib/autoconf/programs.m4:662 +m4_location(AC_PROG_MKDIR_P)../../lib/autoconf/programs.m4:699 T26,36 -m4_location(AC_FUNC_WAIT3)../../lib/autoconf/functions.m4:1975 +m4_location(AC_FUNC_WAIT3)../../lib/autoconf/functions.m4:2025 T17,51 _AS_ECHO_UNQUOTEDAS_ECHO(["$1"]) >&m4_default([$2], [AS_MESSAGE_FD]) T19,120 @@ -6328,11 +6328,11 @@ _AC_FUNCS_EXPANSION m4_define([_AC_FUNCS_EXPANSION], []) T19,34 -m4_location(_AC_DO)../../lib/autoconf/general.m4:2377 +m4_location(_AC_DO)../../lib/autoconf/general.m4:2379 T30,33 m4_location(AC_YYTEXT_POINTER)../../lib/autoconf/oldnames.m4:84 T37,30 -m4_location(AC_LANG_BOOL_COMPILE_TRY)../../lib/autoconf/lang.m4:289 +m4_location(AC_LANG_BOOL_COMPILE_TRY)../../lib/autoconf/lang.m4:290 T20,96 _AS_DETECT_SUGGESTED_m4_defun_pro([$0])m4_set_add([_AS_DETECT_SUGGESTED_BODY], [$1 || AS_EXIT])[]_m4_defun_epi([$0]) T17,57 @@ -6469,7 +6469,7 @@ AC_CHECK_HEADERS_m4_defun_pro([$0])m4_map_args_w([$1], [_AH_CHECK_HEADER(], [)]) [$3], [$4])dnl]) []_m4_defun_epi([$0]) T30,33 -m4_location(AC_PREFIX_DEFAULT)../../lib/autoconf/general.m4:450 +m4_location(AC_PREFIX_DEFAULT)../../lib/autoconf/general.m4:451 F8,5 m4_indirindir T12,1 @@ -6510,7 +6510,7 @@ m4_divert_pop()dnl m4_ifdef([_m4_diverting([AC_NO_EXECUTABLES])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([AC_NO_EXECUTABLES],], [, _m4_divert_dump)]])) T31,30 -m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1845 +m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1849 F12,9 m4_changecomchangecom F6,6 @@ -6526,7 +6526,7 @@ $2 T10,62 m4_noquotem4_changequote([-=<{(],[)}>=-])$1-=<{()}>=-m4_changequote([,]) T27,34 -m4_location(AC_CHECK_FUNCS)../../lib/autoconf/functions.m4:86 +m4_location(AC_CHECK_FUNCS)../../lib/autoconf/functions.m4:92 T13,42 AS_VAR_SET_IFAS_IF([AS_VAR_TEST_SET([$1])], [$2], [$3]) F8,5 @@ -6539,7 +6539,7 @@ _AS_RUNm4_ifval([$2], [{ $as_echo "$as_bourne_compatible"$1 | as_run=a $2; }], T36,33 m4_location(AC_SYS_SIGLIST_DECLARED)../../lib/autoconf/oldnames.m4:79 T27,30 -m4_location(AC_LANG_SOURCE)../../lib/autoconf/lang.m4:224 +m4_location(AC_LANG_SOURCE)../../lib/autoconf/lang.m4:225 T19,260 _AC_FC_DIALECT_YEAR_m4_defun_pro([$0])m4_case(m4_bpatsubsts(m4_tolower([$1]), [fortran],[], [ *],[]), [77],[1977], [1977],[1977], @@ -6690,9 +6690,9 @@ AC_CHECK_HEADER_STDBOOL_m4_defun_pro([$0])AC_CACHE_CHECK([for stdbool.h that con AC_CHECK_TYPES([_Bool]) []_m4_defun_epi([$0]) T30,33 -m4_location(AC_HEADER_STDBOOL)../../lib/autoconf/headers.m4:667 +m4_location(AC_HEADER_STDBOOL)../../lib/autoconf/headers.m4:672 T27,34 -m4_location(AC_FC_WRAPPERS)../../lib/autoconf/fortran.m4:1081 +m4_location(AC_FC_WRAPPERS)../../lib/autoconf/fortran.m4:1086 T18,98 _AC_LANG_OPENMP(C) #ifndef _OPENMP @@ -6814,7 +6814,7 @@ esac AS_LINENO_POP T24,29 -m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:942 +m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:946 T23,2 AC_LANG_SOURCE(Fortran)$1 T12,4700 @@ -6973,9 +6973,9 @@ T12,145 AC_LANG_CALL_m4_defun_pro([$0])m4_ifval([$2], [], [m4_warn([syntax], [$0: no function given])])dnl _AC_LANG_DISPATCH([$0], _AC_LANG, $@)[]_m4_defun_epi([$0]) T36,29 -m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:194 +m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:273 T32,33 -m4_location(AC_INCLUDES_DEFAULT)../../lib/autoconf/headers.m4:353 +m4_location(AC_INCLUDES_DEFAULT)../../lib/autoconf/headers.m4:357 T11,54 m4_ifnblankm4_if(m4_translit([[$1]], [ ][ ][ ]), [], [$3], [$2]) @@ -7157,7 +7157,7 @@ case $ac_cv_c_int$1_t in #( esac []_m4_defun_epi([$0]) T44,32 -m4_location(AC_ERLANG_SUBST_INSTALL_LIB_DIR)../../lib/autoconf/erlang.m4:268 +m4_location(AC_ERLANG_SUBST_INSTALL_LIB_DIR)../../lib/autoconf/erlang.m4:278 T19,166 _AC_CHECK_FUNC_ONCE_AH_CHECK_FUNC([$1])AC_DEFUN([_AC_Func_$1], [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_func_list], [" $1"])]) @@ -7167,13 +7167,13 @@ AM_EXEEXT_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AM_EXEEXT' is ob You should run autoupdate.])dnl m4_if($#, 0, [AC_EXEEXT], [AC_EXEEXT($@)])[]_m4_defun_epi([$0]) T34,31 -m4_location(_AC_TYPE_UNSIGNED_INT)../../lib/autoconf/types.m4:718 +m4_location(_AC_TYPE_UNSIGNED_INT)../../lib/autoconf/types.m4:738 T28,28 -m4_location(_AC_LANG_OPENMP)../../lib/autoconf/c.m4:1941 +m4_location(_AC_LANG_OPENMP)../../lib/autoconf/c.m4:1942 T35,34 -m4_location(AC_SYS_LONG_FILE_NAMES)../../lib/autoconf/specific.m4:193 +m4_location(AC_SYS_LONG_FILE_NAMES)../../lib/autoconf/specific.m4:225 T35,34 -m4_location(AC_FC_MODULE_EXTENSION)../../lib/autoconf/fortran.m4:1696 +m4_location(AC_FC_MODULE_EXTENSION)../../lib/autoconf/fortran.m4:1723 T17,1432 AC_TYPE_GETGROUPS_m4_defun_pro([$0])AC_REQUIRE([AC_TYPE_UID_T])dnl AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups, @@ -7257,11 +7257,11 @@ else fi []_m4_defun_epi([$0]) T26,34 -m4_location(_AC_DO_STDERR)../../lib/autoconf/general.m4:2385 +m4_location(_AC_DO_STDERR)../../lib/autoconf/general.m4:2387 T25,27 m4_location(AC_LANG_OBJC)../../lib/autoconf/c.m4:274 T38,34 -m4_location(AC_CONFIG_AUX_DIR_DEFAULT)../../lib/autoconf/general.m4:1678 +m4_location(AC_CONFIG_AUX_DIR_DEFAULT)../../lib/autoconf/general.m4:1679 F7,4 m4_evaleval T26,2 @@ -7289,7 +7289,7 @@ program_transform_name=`AS_ECHO(["$program_transform_name"]) | sed "$ac_script"` m4_ifdef([_m4_diverting([AC_ARG_PROGRAM])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([AC_ARG_PROGRAM],], [, _m4_divert_dump)]])) T47,32 -m4_location(AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR)../../lib/autoconf/erlang.m4:283 +m4_location(AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR)../../lib/autoconf/erlang.m4:295 T24,3 _m4_divert(VERSION_USER)202 T15,186 @@ -7320,9 +7320,9 @@ AC_TRY_LINK_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_TRY_LINK' i You should run autoupdate.])dnl AC_LINK_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])[]_m4_defun_epi([$0]) T23,30 -m4_location(_AC_PATH_X)../../lib/autoconf/libs.m4:297 +m4_location(_AC_PATH_X)../../lib/autoconf/libs.m4:313 T35,33 -m4_location(_AC_FC_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:634 +m4_location(_AC_FC_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:722 T15,23 AS_EXECUTABLE_Pas_fn_executable_p $1[] T15,129 @@ -7364,9 +7364,9 @@ AC_FUNC_MEMCMP_m4_defun_pro([$0])AC_CACHE_CHECK([for working memcmp], ac_cv_func test $ac_cv_func_memcmp_working = no && AC_LIBOBJ([memcmp]) []_m4_defun_epi([$0]) T31,31 -m4_location(_AC_CHECK_TYPE_NEW)../../lib/autoconf/types.m4:148 +m4_location(_AC_CHECK_TYPE_NEW)../../lib/autoconf/types.m4:160 T27,27 -m4_location(AC_PROG_CC_C_O)../../lib/autoconf/c.m4:567 +m4_location(AC_PROG_CC_C_O)../../lib/autoconf/c.m4:615 T13,50 AC_MSG_RESULT{ _AS_ECHO_LOG([result: $1]) _AS_ECHO([$1]); }dnl @@ -7376,7 +7376,7 @@ AC_LANG_CONFTEST(Fortran)cat > conftest.$ac_ext <<_ACEOF AC_LANG_DEFINES_PROVIDED[]$1 _ACEOF T32,34 -m4_location(_AC_CACHE_CHECK_INT)../../lib/autoconf/general.m4:2064 +m4_location(_AC_CACHE_CHECK_INT)../../lib/autoconf/general.m4:2067 T6,598 m4_form4_pushdef([$1], m4_eval([$2]))m4_cond([m4_eval(([$3]) > ([$2]))], 1, [m4_pushdef([_m4_step], m4_eval(m4_default_quoted([$4], @@ -7466,7 +7466,7 @@ AC_PREREQm4_if(m4_version_compare([2.69], [$1]), [63])])], [$2]) T25,29 -m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:790 +m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:792 T14,1574 _AC_CHECK_PROG_m4_defun_pro([$0])# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=$[2] @@ -7522,7 +7522,7 @@ else fi []_m4_defun_epi([$0]) T28,36 -m4_location(AC_FUNC_VPRINTF)../../lib/autoconf/functions.m4:1955 +m4_location(AC_FUNC_VPRINTF)../../lib/autoconf/functions.m4:1961 T33,0 m4_include(autoconf/functions.m4) T17,185 @@ -7679,7 +7679,7 @@ test -n "$target_alias" && m4_ifdef([_m4_diverting([AC_CANONICAL_TARGET])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([AC_CANONICAL_TARGET],], [, _m4_divert_dump)]])) T31,35 -m4_location(_AC_FUNC_MALLOC_IF)../../lib/autoconf/functions.m4:887 +m4_location(_AC_FUNC_MALLOC_IF)../../lib/autoconf/functions.m4:904 T13,196 AC_GETLOADAVG_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_GETLOADAVG' is obsolete. You should run autoupdate.])dnl @@ -7761,7 +7761,7 @@ AC_TEST_CPP_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_TEST_CPP' i You should run autoupdate.])dnl m4_if($#, 0, [AC_TRY_CPP], [AC_TRY_CPP($@)])[]_m4_defun_epi([$0]) T24,28 -m4_location(AC_C_TYPEOF)../../lib/autoconf/c.m4:1903 +m4_location(AC_C_TYPEOF)../../lib/autoconf/c.m4:1934 T16,265 AC_LANG(Fortran)ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&AS_MESSAGE_LOG_FD' @@ -7769,13 +7769,13 @@ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest ac_compiler_gnu=$ac_cv_fc_compiler_gnu T32,27 -m4_location(_AC_ARG_VAR_LDFLAGS)../../lib/autoconf/c.m4:318 +m4_location(_AC_ARG_VAR_LDFLAGS)../../lib/autoconf/c.m4:321 T34,33 m4_location(AC_STAT_MACROS_BROKEN)../../lib/autoconf/oldnames.m4:74 T24,34 -m4_location(AC_PROG_SED)../../lib/autoconf/programs.m4:867 +m4_location(AC_PROG_SED)../../lib/autoconf/programs.m4:883 T25,27 -m4_location(AC_PROG_OBJC)../../lib/autoconf/c.m4:871 +m4_location(AC_PROG_OBJC)../../lib/autoconf/c.m4:900 T25,34 m4_location(AC_ISC_POSIX)../../lib/autoconf/specific.m4:446 T16,27 @@ -7804,7 +7804,7 @@ _AC_CACHE_CHECK_INT_m4_defun_pro([$0])AC_CACHE_CHECK([$1], [$2], T15,64 AC_TYPE_UINT8_T_m4_defun_pro([$0])_AC_TYPE_UNSIGNED_INT(8)[]_m4_defun_epi([$0]) T30,29 -m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:921 +m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:924 T17,490 _AS_TR_SH_LITERALm4_translit([[$1]], [*+[]][ @@ -7859,7 +7859,7 @@ _AC_LANG_DISPATCH([$0], _AC_LANG, $@) T22,33 m4_location(AC_FD_MSG)../../lib/autoconf/general.m4:384 T33,34 -m4_location(AC_F77_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1675 +m4_location(AC_F77_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1679 T25,53 _m4_expansion_stack_entry_m4_defn([m4_location($1)])[: $1 is expanded from...] T19,191 @@ -7997,7 +7997,7 @@ AS_VAR_IF([ac_Lib], [yes], AS_VAR_POPDEF([ac_Lib])dnl []_m4_defun_epi([$0]) T25,30 -m4_location(AC_LANG_SAVE)../../lib/autoconf/lang.m4:125 +m4_location(AC_LANG_SAVE)../../lib/autoconf/lang.m4:128 T14,159 ac_cv_prog_g77_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `ac_cv_prog_g77' is obsolete. You should run autoupdate.])dnl @@ -8054,9 +8054,9 @@ _AC_PROG_FC_C_O AC_LANG_POP(Fortran)dnl []_m4_defun_epi([$0]) T29,31 -m4_location(AC_TYPE_INTPTR_T)../../lib/autoconf/types.m4:344 +m4_location(AC_TYPE_INTPTR_T)../../lib/autoconf/types.m4:361 T26,33 -m4_location(AC_DIR_HEADER)../../lib/autoconf/headers.m4:883 +m4_location(AC_DIR_HEADER)../../lib/autoconf/headers.m4:895 T14,78 AC_TRY_COMMAND_m4_defun_pro([$0]){ ac_try='$1' _AC_EVAL([$ac_try]); }[]_m4_defun_epi([$0]) @@ -8091,11 +8091,11 @@ AC_TYPE_INTPTR_T_m4_defun_pro([$0]) done]) []_m4_defun_epi([$0]) T25,34 -m4_location(AC_FC_SRCEXT)../../lib/autoconf/fortran.m4:1154 +m4_location(AC_FC_SRCEXT)../../lib/autoconf/fortran.m4:1188 T28,34 -m4_location(AC_FC_FIXEDFORM)../../lib/autoconf/fortran.m4:1420 +m4_location(AC_FC_FIXEDFORM)../../lib/autoconf/fortran.m4:1449 T36,33 -m4_location(AC_CHECK_HEADER_STDBOOL)../../lib/autoconf/headers.m4:600 +m4_location(AC_CHECK_HEADER_STDBOOL)../../lib/autoconf/headers.m4:661 T9,127 _m4_splitm4_changequote([-=<{(],[)}>=-])[m4_bpatsubst(-=<{(-=<{($1)}>=-)}>=-, -=<{($2)}>=-, -=<{(]$3[)}>=-)]m4_changequote([, ]) @@ -8205,13 +8205,13 @@ fi AC_LANG_POP(Fortran)dnl []_m4_defun_epi([$0]) T35,34 -m4_location(AC_PRESERVE_HELP_ORDER)../../lib/autoconf/general.m4:1433 +m4_location(AC_PRESERVE_HELP_ORDER)../../lib/autoconf/general.m4:1442 T26,35 m4_location(AC_GETLOADAVG)../../lib/autoconf/functions.m4:808 T24,34 -m4_location(AC_F77_FUNC)../../lib/autoconf/fortran.m4:1111 +m4_location(AC_F77_FUNC)../../lib/autoconf/fortran.m4:1116 T36,32 -m4_location(AC_LANG_PREPROC(Erlang))../../lib/autoconf/erlang.m4:160 +m4_location(AC_LANG_PREPROC(Erlang))../../lib/autoconf/erlang.m4:162 T8,85 _m4_joinm4_if([$#$2], [2], [], [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift2($@))]) @@ -8238,13 +8238,13 @@ AC_INLINE_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_INLINE' is ob You should run autoupdate.])dnl m4_if($#, 0, [AC_C_INLINE], [AC_C_INLINE($@)])[]_m4_defun_epi([$0]) T26,34 -m4_location(AC_CHECK_DECL)../../lib/autoconf/general.m4:2844 +m4_location(AC_CHECK_DECL)../../lib/autoconf/general.m4:2856 T10,24 AN_PROGRAMAN_OUTPUT([program], $@) T36,30 -m4_location(AC_LANG_PREPROC_REQUIRE)../../lib/autoconf/lang.m4:372 +m4_location(AC_LANG_PREPROC_REQUIRE)../../lib/autoconf/lang.m4:374 T34,31 -m4_location(AC_TYPE_LONG_LONG_INT)../../lib/autoconf/types.m4:503 +m4_location(AC_TYPE_LONG_LONG_INT)../../lib/autoconf/types.m4:542 T16,4 _m4_divert(BODY)1000 T18,1268 @@ -8294,7 +8294,7 @@ m4_set_deletem4_ifdef([_m4_set([$1])], [_m4_set_size($1)], [_m4_popdef([_m4_set_size($1)])])]) T29,34 -m4_location(AC_SYS_LARGEFILE)../../lib/autoconf/specific.m4:134 +m4_location(AC_SYS_LARGEFILE)../../lib/autoconf/specific.m4:177 T35,31 m4_location(AC_STRUCT_DIRENT_D_INO)../../lib/autoconf/types.m4:964 T11,967 @@ -8330,11 +8330,11 @@ AC_C_TYPEOF_m4_defun_pro([$0]) fi []_m4_defun_epi([$0]) T34,29 -m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:279 +m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:297 T28,33 m4_location(AC_PROGRAM_PATH)../../lib/autoconf/oldnames.m4:43 T32,31 -m4_location(AC_ERLANG_NEED_ERLC)../../lib/autoconf/erlang.m4:63 +m4_location(AC_ERLANG_NEED_ERLC)../../lib/autoconf/erlang.m4:68 T20,177 _AC_CHECK_HEADER_OLD_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `$0' is obsolete. You should use AC_CHECK_HEADER with a fourth argument.])_AC_CHECK_HEADER_PREPROC($@)[]_m4_defun_epi([$0]) @@ -8352,15 +8352,15 @@ else fi []_m4_defun_epi([$0]) T27,30 -m4_location(AC_REQUIRE_CPP)../../lib/autoconf/lang.m4:381 +m4_location(AC_REQUIRE_CPP)../../lib/autoconf/lang.m4:382 T24,34 -m4_location(AC_PROG_LEX)../../lib/autoconf/programs.m4:709 +m4_location(AC_PROG_LEX)../../lib/autoconf/programs.m4:713 T12,10 m4_cr_digits0123456789 T31,33 -m4_location(_AC_FORTRAN_ASSERT)../../lib/autoconf/fortran.m4:158 +m4_location(_AC_FORTRAN_ASSERT)../../lib/autoconf/fortran.m4:161 T33,27 -m4_location(_AC_ARG_VAR_CPPFLAGS)../../lib/autoconf/c.m4:308 +m4_location(_AC_ARG_VAR_CPPFLAGS)../../lib/autoconf/c.m4:311 T17,17 m4_PACKAGE_STRINGGNU Autoconf 2.69 T30,6 @@ -8382,12 +8382,12 @@ AS_TEST_X_m4_defun_pro([$0])AS_REQUIRE([_AS_TEST_PREPARE])[]_m4_popdef([$0])m4_i T21,145 AC_LANG_FUNC_LINK_TRY_m4_defun_pro([$0])m4_ifval([$1], [], [m4_warn([syntax], [$0: no function given])])dnl _AC_LANG_DISPATCH([$0], _AC_LANG, $@)[]_m4_defun_epi([$0]) -T27,35 -m4_location(AC_FUNC_MKTIME)../../lib/autoconf/functions.m4:987 +T27,36 +m4_location(AC_FUNC_MKTIME)../../lib/autoconf/functions.m4:1190 T32,34 -m4_location(AC_FC_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1684 +m4_location(AC_FC_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1688 T25,33 -m4_location(AC_ARG_ARRAY)../../lib/autoconf/specific.m4:82 +m4_location(AC_ARG_ARRAY)../../lib/autoconf/specific.m4:84 T28,33 m4_location(AC_HEADER_EGREP)../../lib/autoconf/oldnames.m4:37 T15,863 @@ -8414,9 +8414,9 @@ if test $ac_cv_prog_[]_AC_LANG_ABBREV[]_c_o = no; then fi []_m4_defun_epi([$0]) T23,34 -m4_location(AC_TRY_RUN)../../lib/autoconf/general.m4:2764 +m4_location(AC_TRY_RUN)../../lib/autoconf/general.m4:2765 T31,32 -m4_location(AC_STRUCT_TIMEZONE)../../lib/autoconf/types.m4:1050 +m4_location(AC_STRUCT_TIMEZONE)../../lib/autoconf/types.m4:1077 F10,6 _m4_popdefpopdef T9,68 @@ -8463,7 +8463,7 @@ m4_wrap([m4_popdef([_m4_divert_diversion])m4_ifdef( ]m4_divert_stack)])_m4_popdef([_m4_divert_stack])m4_divert_push([KILL])]) T21,29 -m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:883 +m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:887 T24,2 _AC_LANG_PREFIX(Fortran)FC T15,376 @@ -8529,9 +8529,9 @@ AC_CONFIG_COMMANDS_PRE([case $FC_MODOUT in #( esac])dnl []_m4_defun_epi([$0]) T32,33 -m4_location(_AC_FC_DIALECT_YEAR)../../lib/autoconf/fortran.m4:278 +m4_location(_AC_FC_DIALECT_YEAR)../../lib/autoconf/fortran.m4:285 T28,34 -m4_location(_AC_LINK_IFELSE)../../lib/autoconf/general.m4:2661 +m4_location(_AC_LINK_IFELSE)../../lib/autoconf/general.m4:2670 T29,33 m4_location(AC_PROGRAM_EGREP)../../lib/autoconf/oldnames.m4:42 T11,162 @@ -8591,7 +8591,7 @@ AC_MSG_RESULT([$cross_compiling]) T12,16 m4_wrap_lifo_m4_wrap([$1[]]) T22,34 -m4_location(AC_ENABLE)../../lib/autoconf/general.m4:1475 +m4_location(AC_ENABLE)../../lib/autoconf/general.m4:1476 T10,103 m4_flattenm4_if(m4_index([$1], [ ]), [-1], [[$1]], @@ -8632,9 +8632,9 @@ _AC_LANG_OPENMP(Fortran 77) T31,68 AC_LANG_COMPILER(Objective C++)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_OBJCXX])[]_m4_defun_epi([$0]) T22,30 -m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1859 +m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1861 T34,34 -m4_location(AC_CHECK_TARGET_TOOLS)../../lib/autoconf/programs.m4:314 +m4_location(AC_CHECK_TARGET_TOOLS)../../lib/autoconf/programs.m4:332 T8,28 _AS_CASE [@%:@(] $1[)] : @@ -8675,9 +8675,9 @@ AC_ST_BLKSIZE_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_ST_BLKSIZ You should run autoupdate.])dnl m4_if($#, 0, [AC_STRUCT_ST_BLKSIZE], [AC_STRUCT_ST_BLKSIZE($@)])[]_m4_defun_epi([$0]) T19,29 -m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:607 +m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:613 T29,36 -m4_location(AC_FUNC_STRFTIME)../../lib/autoconf/functions.m4:1665 +m4_location(AC_FUNC_STRFTIME)../../lib/autoconf/functions.m4:1671 T9,156 m4_escapem4_if(m4_index(m4_translit([$1], [[]#,()][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789], [$$$]), [$]), @@ -8771,9 +8771,9 @@ AS_VAR_IF([ac_File], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_File])dnl []_m4_defun_epi([$0]) T37,34 -m4_location(AC_FC_MODULE_OUTPUT_FLAG)../../lib/autoconf/fortran.m4:1812 +m4_location(AC_FC_MODULE_OUTPUT_FLAG)../../lib/autoconf/fortran.m4:1862 T24,34 -m4_location(AC_ARG_WITH)../../lib/autoconf/general.m4:1481 +m4_location(AC_ARG_WITH)../../lib/autoconf/general.m4:1490 T11,322 AC_LANG_POP_m4_defun_pro([$0])m4_ifval([$1], [m4_if([$1], m4_defn([_AC_LANG]), [], @@ -8798,9 +8798,9 @@ if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then fi []_m4_defun_epi([$0]) T29,29 -m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:975 +m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:980 T28,28 -m4_location(_AC_PROG_CC_C99)../../lib/autoconf/c.m4:1205 +m4_location(_AC_PROG_CC_C99)../../lib/autoconf/c.m4:1357 T20,112 _AC_MSG_LOG_CONFTESTAS_ECHO(["$as_me: failed program was:"]) >&AS_MESSAGE_LOG_FD sed 's/^/| /' conftest.$ac_ext >&AS_MESSAGE_LOG_FD @@ -8839,11 +8839,11 @@ AC_CHECK_TYPE_m4_defun_pro([$0])m4_cond([$#], [3], T12,24 m4_rename_m4m4_rename([$1], [m4_$1]) T30,29 -m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:657 +m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:663 T20,111 m4_stack_foreach_sep_m4_stack_reverse([$1], [m4_tmp-$1])_m4_stack_reverse([m4_tmp-$1], [$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]]) T20,30 -m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1026 +m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1028 T20,294 _AC_COMPUTE_INT_BODY AS_LINENO_PUSH([$[]1]) if test "$cross_compiling" = yes; then @@ -8865,7 +8865,7 @@ AC_LANG_FORTRAN77_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_LANG_ You should run autoupdate.])dnl AC_LANG(Fortran 77)[]_m4_defun_epi([$0]) T32,34 -m4_location(AC_CHECK_DECLS_ONCE)../../lib/autoconf/general.m4:2894 +m4_location(AC_CHECK_DECLS_ONCE)../../lib/autoconf/general.m4:2895 T6,91 _AC_DO_m4_defun_pro([$0])_AC_RUN_LOG([eval "$1"], [_AC_DO_ECHO([$1])])[]_m4_defun_epi([$0]) @@ -8895,7 +8895,7 @@ fi T18,71 AC_CONFIG_COMMANDS_m4_defun_pro([$0])_AC_CONFIG_FOOS([COMMANDS], $@)[]_m4_defun_epi([$0]) T35,30 -m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1906 +m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1921 T15,393 AC_HAVE_LIBRARY_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_HAVE_LIBRARY' is obsolete. You should run autoupdate.])dnl @@ -8910,7 +8910,7 @@ m4_popdef([AC_Lib_Name])dnl T25,98 AC_CONFIG_AUX_DIR_DEFAULT_m4_defun_pro([$0])AC_CONFIG_AUX_DIRS("$srcdir" "$srcdir/.." "$srcdir/../..")[]_m4_defun_epi([$0]) T28,36 -m4_location(AC_FUNC_SETPGRP)../../lib/autoconf/functions.m4:1477 +m4_location(AC_FUNC_SETPGRP)../../lib/autoconf/functions.m4:1492 T19,156 _m4_defun_pro_outerm4_set_delete([_m4_provide])m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])m4_pushdef([_m4_divert_dump], m4_divnum)m4_divert_push([GROW]) T18,49 @@ -8930,11 +8930,11 @@ m4_set_intersectionm4_if([$1], [$2], [m4_set_listc([$1])], m4_eval(m4_set_size([$2]) < m4_set_size([$1])), [1], [$0([$2], [$1])], [m4_set_map_sep([$1], [_$0([$2],], [)])]) T27,28 -m4_location(AC_PROG_CC_C89)../../lib/autoconf/c.m4:1362 +m4_location(AC_PROG_CC_C89)../../lib/autoconf/c.m4:1365 T27,30 -m4_location(AC_LANG_WERROR)../../lib/autoconf/lang.m4:719 +m4_location(AC_LANG_WERROR)../../lib/autoconf/lang.m4:721 T29,33 -m4_location(AC_FC_DUMMY_MAIN)../../lib/autoconf/fortran.m4:843 +m4_location(AC_FC_DUMMY_MAIN)../../lib/autoconf/fortran.m4:848 T19,147 AS_REQUIRE_SHELL_FNm4_provide_if([AS_SHELL_FN_$1], [], [AS_REQUIRE([AS_SHELL_FN_$1], @@ -8963,7 +8963,7 @@ m4_stack_foreach_lifo_m4_stack_reverse([$1], [m4_tmp-$1], [$2(_m4_defn([m4_tmp-$ T11,33 m4_set_listm4_set_map_sep([$1], [], [], [,]) T30,35 -m4_location(AC_FUNC_GETMNTENT)../../lib/autoconf/functions.m4:814 +m4_location(AC_FUNC_GETMNTENT)../../lib/autoconf/functions.m4:822 T27,155 _AC_LANG_IO_PROGRAM(Erlang)AC_LANG_PROGRAM([], [dnl ReturnValue = case file:write_file("conftest.out", "") of @@ -8992,9 +8992,9 @@ m4_ifdef([_m4_diverting([AC_PROG_LEX])], [-]), [-], [[m4_unquote(], [)]], T21,65 AC_LANG_COMPILER(C++)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_CXX])[]_m4_defun_epi([$0]) T32,29 -m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:156 +m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:157 T23,29 -m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:353 +m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:373 T31,154 AC_VALIDATE_CACHED_SYSTEM_TUPLE_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_VALIDATE_CACHED_SYSTEM_TUPLE' is obsolete. You should run autoupdate.])dnl @@ -9013,7 +9013,7 @@ test ac_cv_header_dirent_sys_dir_h && test ac_cv_header_dirent_ndir_h && AC_DEFINE([NDIR], 1, [Same as `HAVE_NDIR_H', don't depend on me.])[]_m4_defun_epi([$0]) T29,30 -m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1384 +m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1391 F8,8 __line____line__ T23,350 @@ -9033,7 +9033,7 @@ _AC_CHECK_TYPE_NEW_BODY AS_LINENO_PUSH([$[]1]) AS_LINENO_POP T34,35 -m4_location(AC_FUNC_ERROR_AT_LINE)../../lib/autoconf/functions.m4:486 +m4_location(AC_FUNC_ERROR_AT_LINE)../../lib/autoconf/functions.m4:496 T13,41 _m4_set_unionm4_ifdef([_m4_set([$1],$2)], [], [,[$2]]) T15,88 @@ -9049,9 +9049,9 @@ _AC_COPYRIGHT_YEARS Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. T27,31 -m4_location(AC_TYPE_SIGNAL)../../lib/autoconf/types.m4:746 +m4_location(AC_TYPE_SIGNAL)../../lib/autoconf/types.m4:759 T28,36 -m4_location(AC_FUNC_STRTOLD)../../lib/autoconf/functions.m4:1589 +m4_location(AC_FUNC_STRTOLD)../../lib/autoconf/functions.m4:1614 T10,55 _m4_shift2m4_if([$#], [2], [], [, m4_shift(m4_shift($@))]) @@ -9105,7 +9105,7 @@ m4_if($#, 0, [AC_TYPE_PID_T], [AC_TYPE_PID_T($@)])[]_m4_defun_epi([$0]) T23,3 _m4_divert(VERSION_END)203 T43,27 -m4_location(AC_LANG_PREPROC(Objective C++))../../lib/autoconf/c.m4:954 +m4_location(AC_LANG_PREPROC(Objective C++))../../lib/autoconf/c.m4:955 T13,383 _AS_PATH_WALKas_save_IFS=$IFS; IFS=$PATH_SEPARATOR m4_ifvaln([$3], [as_found=false])dnl @@ -9144,11 +9144,11 @@ _AC_CHECK_DECL_BODY AS_LINENO_PUSH([$[]1]) AS_LINENO_POP T36,27 -m4_location(AC_PROG_GCC_TRADITIONAL)../../lib/autoconf/c.m4:543 +m4_location(AC_PROG_GCC_TRADITIONAL)../../lib/autoconf/c.m4:562 T28,1 _m4_divert(HEADER-COPYRIGHT)3 T29,31 -m4_location(AC_TYPE_INTMAX_T)../../lib/autoconf/types.m4:310 +m4_location(AC_TYPE_INTMAX_T)../../lib/autoconf/types.m4:322 T11,58 _AS_CLEANUPm4_divert_text([M4SH-SANITIZE], [_AS_DETECT_BETTER_SHELL]) T21,1512 @@ -9237,7 +9237,7 @@ m4_text_boxm4_pushdef([m4_Border], [##] $1 [##] [##] _m4_defn([m4_Border]) [##]_m4_popdef([m4_Border]) T36,36 -m4_location(AC_FUNC_SELECT_ARGTYPES)../../lib/autoconf/functions.m4:1434 +m4_location(AC_FUNC_SELECT_ARGTYPES)../../lib/autoconf/functions.m4:1472 T23,378 _AC_CHECK_HEADER_DIRENTAS_VAR_PUSHDEF([ac_Header], [ac_cv_header_dirent_$1])dnl AC_CACHE_CHECK([for $1 that defines DIR], [ac_Header], @@ -9286,9 +9286,9 @@ m4_set_containsm4_ifdef([_m4_set_cleanup($1)], F10,7 m4_esyscmdesyscmd T32,36 -m4_location(_AC_FUNC_REALLOC_IF)../../lib/autoconf/functions.m4:1392 +m4_location(_AC_FUNC_REALLOC_IF)../../lib/autoconf/functions.m4:1409 T27,31 -m4_location(AC_CHECK_TYPES)../../lib/autoconf/types.m4:178 +m4_location(AC_CHECK_TYPES)../../lib/autoconf/types.m4:180 T31,0 m4_include(autoconf/fortran.m4) T34,23 @@ -9304,9 +9304,9 @@ m4_set_mapm4_set_map_sep([$1], [$2(], [)]) T23,36 m4_location(AC_STRCOLL)../../lib/autoconf/functions.m4:1744 T34,27 -m4_location(AC_LANG_COMPILER(C++))../../lib/autoconf/c.m4:667 +m4_location(AC_LANG_COMPILER(C++))../../lib/autoconf/c.m4:668 T30,33 -m4_location(AC_CONFIG_SUBDIRS)../../lib/autoconf/status.m4:1097 +m4_location(AC_CONFIG_SUBDIRS)../../lib/autoconf/status.m4:1106 T14,53 m4_cr_symbols1abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_ T14,181 @@ -9354,7 +9354,7 @@ AC_CACHE_CHECK([for egrep], ac_cv_path_EGREP, AC_SUBST([EGREP]) []_m4_defun_epi([$0]) T23,29 -m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:834 +m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:839 F7,4 m4_decrdecr T14,32 @@ -9399,7 +9399,7 @@ fi T15,36 m4_set_contentsm4_set_map_sep([$1], [], [], [[$2]]) T32,30 -m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1011 +m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1018 T15,55 _AS_TR_SH_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_sh` T18,316 @@ -9416,13 +9416,13 @@ $2 return 0; } T20,29 -m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:550 +m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:553 T28,33 m4_location(AC_TEST_PROGRAM)../../lib/autoconf/oldnames.m4:46 T27,33 m4_location(AC_SIZEOF_TYPE)../../lib/autoconf/oldnames.m4:44 T22,28 -m4_location(AC_OPENMP)../../lib/autoconf/c.m4:1986 +m4_location(AC_OPENMP)../../lib/autoconf/c.m4:2031 T10,168 m4_combinem4_if([$2], [], [], m4_eval([$# > 3]), [1], [m4_map_args_sep([m4_map_args_sep(m4_dquote(], [)[[$3]], [], [[$1]],]]m4_dquote(m4_dquote(m4_shift3($@)))[[)], [[$1]], $2)]) @@ -9547,20 +9547,20 @@ extern "C" #endif char $2 ();])], [return $2 ();]) T23,30 -m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1002 +m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1006 T27,34 -m4_location(AC_TRY_COMPILE)../../lib/autoconf/general.m4:2614 +m4_location(AC_TRY_COMPILE)../../lib/autoconf/general.m4:2615 T33,34 -m4_location(AC_CHECK_TARGET_TOOL)../../lib/autoconf/programs.m4:291 +m4_location(AC_CHECK_TARGET_TOOL)../../lib/autoconf/programs.m4:305 T26,34 -m4_location(AC_CHECK_PROG)../../lib/autoconf/programs.m4:100 +m4_location(AC_CHECK_PROG)../../lib/autoconf/programs.m4:103 F12,8 m4_bpatsubstpatsubst T30,36 AC_LANG_FUNC_LINK_TRY(Fortran)AC_LANG_PROGRAM([], [ call $1]) T31,29 -m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:451 +m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:504 T28,31 m4_location(AC_TYPE_SSIZE_T)../../lib/autoconf/types.m4:605 T7,2 @@ -9570,7 +9570,7 @@ AS_ORIGINAL_STDIN_FD7 T31,33 m4_location(AC_LONG_FILE_NAMES)../../lib/autoconf/oldnames.m4:64 T32,34 -m4_location(AC_CANONICAL_TARGET)../../lib/autoconf/general.m4:1833 +m4_location(AC_CANONICAL_TARGET)../../lib/autoconf/general.m4:1854 T13,76 _AC_DO_TOKENS_m4_defun_pro([$0]){ ac_try='$1' _AC_DO([$ac_try]); }[]_m4_defun_epi([$0]) @@ -9579,7 +9579,7 @@ AC_LANG_m4_defun_pro([$0])_AC_LANG_SET(m4_ifdef([_AC_LANG], [m4_defn([_AC_LANG]) [$1])dnl m4_define([_AC_LANG], [$1])[]_m4_defun_epi([$0]) T37,36 -m4_location(AC_FUNC_SETVBUF_REVERSED)../../lib/autoconf/functions.m4:1710 +m4_location(AC_FUNC_SETVBUF_REVERSED)../../lib/autoconf/functions.m4:1714 T28,86 _AC_LANG_IO_PROGRAM(Fortran)AC_LANG_PROGRAM([], [dnl @@ -9596,13 +9596,13 @@ AC_TRY_CPP_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_TRY_CPP' is You should run autoupdate.])dnl AC_PREPROC_IFELSE([AC_LANG_SOURCE([[$1]])], [$2], [$3])[]_m4_defun_epi([$0]) T26,30 -m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1339 +m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1356 T37,33 -m4_location(_AC_CHECK_HEADER_PREPROC)../../lib/autoconf/headers.m4:193 +m4_location(_AC_CHECK_HEADER_PREPROC)../../lib/autoconf/headers.m4:203 T24,33 -m4_location(AC_MEMORY_H)../../lib/autoconf/headers.m4:868 +m4_location(AC_MEMORY_H)../../lib/autoconf/headers.m4:875 T30,35 -m4_location(AC_FUNC_GETGROUPS)../../lib/autoconf/functions.m4:625 +m4_location(AC_FUNC_GETGROUPS)../../lib/autoconf/functions.m4:656 T7,91 m4_argnm4_assert([0 < $1])m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@) F7,7 @@ -9647,9 +9647,9 @@ _AC_FC_WRAPPERS AC_LANG_POP(Fortran 77)dnl []_m4_defun_epi([$0]) T27,27 -m4_location(ac_cv_prog_gcc)../../lib/autoconf/c.m4:436 +m4_location(ac_cv_prog_gcc)../../lib/autoconf/c.m4:437 T29,30 -m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1044 +m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1082 T8,27 m4_ifvalm4_if([$1], [], [$3], [$2]) T7,197 @@ -9678,7 +9678,7 @@ AC_SUBST([ERLANG_ERTS_VER], [$ac_cv_erlang_erts_ver]) T29,31 m4_location(AC_TYPE_UINT32_T)../../lib/autoconf/types.m4:630 T40,34 -m4_location(AC_SYS_RESTARTABLE_SYSCALLS)../../lib/autoconf/specific.m4:232 +m4_location(AC_SYS_RESTARTABLE_SYSCALLS)../../lib/autoconf/specific.m4:287 T16,63 AC_CONFIG_HEADER_m4_defun_pro([$0])AC_CONFIG_HEADERS([$1])[]_m4_defun_epi([$0]) T26,34 @@ -9694,8 +9694,8 @@ You should run autoupdate.])dnl m4_if($#, 0, [AC_FUNC_UTIME_NULL], [AC_FUNC_UTIME_NULL($@)])[]_m4_defun_epi([$0]) T11,55 AC_TRY_EVAL_m4_defun_pro([$0])_AC_EVAL([$$1])[]_m4_defun_epi([$0]) -T32,31 -m4_location(AC_STRUCT_ST_BLOCKS)../../lib/autoconf/types.m4:999 +T32,32 +m4_location(AC_STRUCT_ST_BLOCKS)../../lib/autoconf/types.m4:1006 T30,33 m4_location(AC_PROGRAMS_CHECK)../../lib/autoconf/oldnames.m4:39 T14,157 @@ -9723,7 +9723,7 @@ extern "C" #endif char $2 ();])], [return $2 ();]) T28,33 -m4_location(AC_PROG_F77_C_O)../../lib/autoconf/fortran.m4:465 +m4_location(AC_PROG_F77_C_O)../../lib/autoconf/fortran.m4:470 T15,865 _AC_PROG_OBJC_Gac_test_OBJCFLAGS=${OBJCFLAGS+set} ac_save_OBJCFLAGS=$OBJCFLAGS @@ -9813,7 +9813,7 @@ T13,41 m4_provide_ifm4_ifdef([m4_provide($1)], [$2], [$3]) T33,34 -m4_location(_AC_FC_NAME_MANGLING)../../lib/autoconf/fortran.m4:1015 +m4_location(_AC_FC_NAME_MANGLING)../../lib/autoconf/fortran.m4:1021 T16,838 _AS_LN_S_PREPARE_m4_defun_pro([$0])rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -9891,11 +9891,11 @@ _ASUNAME _AS_PATH_WALK([$PATH], [AS_ECHO(["PATH: $as_dir"])]) } T46,33 -m4_location(_AC_INCLUDES_DEFAULT_REQUIREMENTS)../../lib/autoconf/headers.m4:297 +m4_location(_AC_INCLUDES_DEFAULT_REQUIREMENTS)../../lib/autoconf/headers.m4:341 T30,27 -m4_location(AC_PROG_OBJCXXCPP)../../lib/autoconf/c.m4:961 +m4_location(AC_PROG_OBJCXXCPP)../../lib/autoconf/c.m4:986 T24,34 -m4_location(AC_IRIX_SUN)../../lib/autoconf/specific.m4:474 +m4_location(AC_IRIX_SUN)../../lib/autoconf/specific.m4:476 T29,33 m4_location(AC_CHAR_UNSIGNED)../../lib/autoconf/oldnames.m4:54 T7,16 @@ -9917,15 +9917,15 @@ m4_location(AC_SIZE_T)../../lib/autoconf/oldnames.m4:73 T20,4 _m4_divert_diversionKILL T24,29 -m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:322 +m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:345 T22,30 -m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1034 +m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1036 T21,33 m4_location(AC_OFF_T)../../lib/autoconf/oldnames.m4:68 T30,30 -m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1805 +m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1809 T23,30 -m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1289 +m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1291 T26,0 m4_include(autoconf/go.m4) F12,8 @@ -9976,7 +9976,7 @@ T10,86 m4_toupperm4_translit([[$1]], [abcdefghijklmnopqrstuvwxyz], [ABCDEFGHIJKLMNOPQRSTUVWXYZ]) T25,30 -m4_location(AC_LANG_CALL)../../lib/autoconf/lang.m4:272 +m4_location(AC_LANG_CALL)../../lib/autoconf/lang.m4:274 T8,19 m4_curry$1(m4_shift($@,)_$0 F4,4 @@ -9990,7 +9990,7 @@ AC_HELP_STRING_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_HELP_STR You should run autoupdate.])dnl m4_if($#, 0, [AS_HELP_STRING], [AS_HELP_STRING($@)])[]_m4_defun_epi([$0]) T33,31 -m4_location(AC_STRUCT_ST_BLKSIZE)../../lib/autoconf/types.m4:973 +m4_location(AC_STRUCT_ST_BLKSIZE)../../lib/autoconf/types.m4:981 T16,56 _AS_TR_CPP_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_cpp` T23,83 @@ -10052,9 +10052,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl []_m4_defun_epi([$0]) T31,34 -m4_location(AC_CANONICAL_BUILD)../../lib/autoconf/general.m4:1788 +m4_location(AC_CANONICAL_BUILD)../../lib/autoconf/general.m4:1810 T30,31 -m4_location(_AC_STRUCT_DIRENT)../../lib/autoconf/types.m4:939 +m4_location(_AC_STRUCT_DIRENT)../../lib/autoconf/types.m4:960 T17,28 m4_default_nblankm4_ifblank([$1], [$2], [$1]) T11,3 @@ -10064,8 +10064,8 @@ AC_TYPE_SSIZE_T_m4_defun_pro([$0])AC_CHECK_TYPE(ssize_t, int)[]_m4_defun_epi([$0 T14,113 AC_CHECK_TYPES_m4_defun_pro([$0])m4_map_args_sep([_AC_CHECK_TYPE_NEW(_$0(], [)[ $2], [$3], [$4])], [], $1)[]_m4_defun_epi([$0]) -T28,29 -m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:982 +T28,30 +m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:1000 T18,540 _AS_TR_CPP_LITERALm4_translit([[$1]], [*[]][abcdefghijklmnopqrstuvwxyz @@ -10138,9 +10138,9 @@ T12,48 m4_re_escapem4_bpatsubst([$1], [[][*+.?\^$]], [\\\&]) T31,27 -m4_location(AC_LANG_PREPROC(C))../../lib/autoconf/c.m4:336 +m4_location(AC_LANG_PREPROC(C))../../lib/autoconf/c.m4:337 T25,36 -m4_location(AC_FUNC_FORK)../../lib/autoconf/functions.m4:1786 +m4_location(AC_FUNC_FORK)../../lib/autoconf/functions.m4:1824 T12,26 m4_normalizem4_strip(m4_flatten([$1])) T6,132 @@ -10154,11 +10154,11 @@ _ACEOF T16,89 AC_CONFIG_SRCDIR_m4_defun_pro([$0])m4_divert_text([DEFAULTS], [ac_unique_file="$1"])[]_m4_defun_epi([$0]) T23,34 -m4_location(AC_RUN_LOG)../../lib/autoconf/general.m4:2468 +m4_location(AC_RUN_LOG)../../lib/autoconf/general.m4:2470 F3,3 dnldnl T27,34 -m4_location(AC_CHECK_DECLS)../../lib/autoconf/general.m4:2880 +m4_location(AC_CHECK_DECLS)../../lib/autoconf/general.m4:2881 T16,807 _AC_INIT_PACKAGE_AC_INIT_LITERAL([$1]) _AC_INIT_LITERAL([$2]) @@ -10185,7 +10185,7 @@ m4_ifndef([AC_PACKAGE_URL], [[$5]]))]) T31,33 -m4_location(AC_HEADER_SYS_WAIT)../../lib/autoconf/headers.m4:734 +m4_location(AC_HEADER_SYS_WAIT)../../lib/autoconf/headers.m4:756 T25,3 _m4_divert(VERSION_BEGIN)200 T27,2052 @@ -10261,7 +10261,7 @@ if test $ac_cv_lib_error_at_line = no; then fi []_m4_defun_epi([$0]) T31,33 -m4_location(AC_SYS_INTERPRETER)../../lib/autoconf/specific.m4:59 +m4_location(AC_SYS_INTERPRETER)../../lib/autoconf/specific.m4:73 T22,33 m4_location(AC_MODE_T)../../lib/autoconf/oldnames.m4:67 T14,116 @@ -10275,7 +10275,7 @@ T18,95 AC_PROG_CPP_WERROR_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_CPP])dnl ac_c_preproc_warn_flag=yes[]_m4_defun_epi([$0]) T29,30 -m4_location(AC_LANG_CONFTEST)../../lib/autoconf/lang.m4:193 +m4_location(AC_LANG_CONFTEST)../../lib/autoconf/lang.m4:197 T10,79 _m4_shiftnm4_if([$1], 1, [m4_shift(], [$0(m4_decr([$1])]), m4_shift(m4_shift($@))) @@ -10433,7 +10433,7 @@ m4_if([$0], [m4_require], [[m4_defun]], [[AC_DEFUN]])['d macro])])m4_provide_if( [_m4_require_check([$1], _m4_defn([m4_provide($1)]), [$0])], [m4_ignore])], [_m4_require_call])([$1], [$2], _m4_divert_dump) T28,36 -m4_location(AC_FUNC_STRNLEN)../../lib/autoconf/functions.m4:1677 +m4_location(AC_FUNC_STRNLEN)../../lib/autoconf/functions.m4:1705 T7,119 m4_casem4_if([$#], 0, [], [$#], 1, [], @@ -10476,11 +10476,11 @@ T11,55 m4_sincludem4_include_unique([$1])dnl m4_builtin([sinclude], [$1]) T32,34 -m4_location(AC_PATH_TARGET_TOOL)../../lib/autoconf/programs.m4:271 +m4_location(AC_PATH_TARGET_TOOL)../../lib/autoconf/programs.m4:285 T41,33 -m4_location(AC_LANG_COMPILER(Fortran 77))../../lib/autoconf/fortran.m4:254 +m4_location(AC_LANG_COMPILER(Fortran 77))../../lib/autoconf/fortran.m4:255 T23,33 -m4_location(AC_FC_MAIN)../../lib/autoconf/fortran.m4:901 +m4_location(AC_FC_MAIN)../../lib/autoconf/fortran.m4:906 F6,6 definedefine T25,2 @@ -10518,7 +10518,7 @@ extern "C" #endif char $2 ();])], [return $2 ();]) T27,34 -m4_location(AC_CHECK_TOOLS)../../lib/autoconf/programs.m4:245 +m4_location(AC_CHECK_TOOLS)../../lib/autoconf/programs.m4:265 T12,197 AC_ST_BLOCKS_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_ST_BLOCKS' is obsolete. You should run autoupdate.])dnl @@ -10551,13 +10551,13 @@ else fi []_m4_defun_epi([$0]) T31,27 -m4_location(AC_PROG_CPP_WERROR)../../lib/autoconf/c.m4:422 +m4_location(AC_PROG_CPP_WERROR)../../lib/autoconf/c.m4:424 T19,62 m4_version_unletterm4_substr(m4_map_args([.m4_eval], m4_unquote(_$0([$1]))), [3]) T23,34 -m4_location(AC_MINGW32)../../lib/autoconf/specific.m4:349 +m4_location(AC_MINGW32)../../lib/autoconf/specific.m4:356 T26,31 -m4_location(AC_CHECK_TYPE)../../lib/autoconf/types.m4:232 +m4_location(AC_CHECK_TYPE)../../lib/autoconf/types.m4:242 T26,23 _AC_LANG_NULL_PROGRAM(C++)AC_LANG_PROGRAM([], []) T15,318 @@ -10578,7 +10578,7 @@ AC_DIVERT_POPm4_if([$1], [], [], ]m4_divert_stack)])_m4_popdef([_m4_divert_stack], [_m4_divert_diversion])m4_ifdef([_m4_divert_diversion], [], [m4_fatal([too many m4_divert_pop])])_m4_divert_raw(_m4_divert(_m4_defn([_m4_divert_diversion]), [-])) T24,33 -m4_location(AC_PROG_F77)../../lib/autoconf/fortran.m4:358 +m4_location(AC_PROG_F77)../../lib/autoconf/fortran.m4:371 T17,32 m4_define_defaultm4_ifndef([$1], [m4_define($@)]) T21,696 @@ -10624,9 +10624,9 @@ m4_PACKAGE_NAMEGNU Autoconf T36,31 m4_location(AC_STRUCT_DIRENT_D_TYPE)../../lib/autoconf/types.m4:968 T27,34 -m4_location(AC_LINK_IFELSE)../../lib/autoconf/general.m4:2678 +m4_location(AC_LINK_IFELSE)../../lib/autoconf/general.m4:2680 T29,33 -m4_location(AC_CONFIG_SRCDIR)../../lib/autoconf/general.m4:481 +m4_location(AC_CONFIG_SRCDIR)../../lib/autoconf/general.m4:482 F10,7 m4_builtinbuiltin T19,2 @@ -10644,23 +10644,23 @@ _AC_CHECK_HEADER_MONGREL_m4_defun_pro([$0])AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ AS_VAR_IF([ac_Header], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_Header])[]_m4_defun_epi([$0]) T26,34 -m4_location(AC_PROG_FGREP)../../lib/autoconf/programs.m4:370 +m4_location(AC_PROG_FGREP)../../lib/autoconf/programs.m4:380 T41,27 -m4_location(AC_LANG_PREPROC(Objective C))../../lib/autoconf/c.m4:815 +m4_location(AC_LANG_PREPROC(Objective C))../../lib/autoconf/c.m4:816 T34,0 m4_include(autoconf/autoupdate.m4) T31,33 m4_location(AC_MINUS_C_MINUS_O)../../lib/autoconf/oldnames.m4:66 T26,35 -m4_location(AC_FUNC_CHOWN)../../lib/autoconf/functions.m4:424 +m4_location(AC_FUNC_CHOWN)../../lib/autoconf/functions.m4:453 T35,33 -m4_location(AC_F77_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:727 +m4_location(AC_F77_LIBRARY_LDFLAGS)../../lib/autoconf/fortran.m4:732 T10,266 AS_REQUIRE_m4_defun_pro([$0])m4_define([_m4_divert_desired], [m4_default_quoted([$3], [M4SH-INIT])])m4_if(m4_eval(_m4_divert_dump - 0 <= _m4_divert(_m4_divert_desired, [-])), 1, [m4_require(], [m4_divert_require(_m4_divert_desired,]) [$1], [$2])[]_m4_defun_epi([$0]) T34,34 -m4_location(_AC_F77_NAME_MANGLING)../../lib/autoconf/fortran.m4:1004 +m4_location(_AC_F77_NAME_MANGLING)../../lib/autoconf/fortran.m4:1010 T14,44 m4_divert_oncem4_expand_once([m4_divert_text([$1], [$2])]) T11,146 @@ -10698,11 +10698,11 @@ _AC_PROG_OBJC_G AC_LANG_POP(Objective C)dnl []_m4_defun_epi([$0]) T29,29 -m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:926 +m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:940 T27,33 -m4_location(_AC_CHECK_PROG)../../lib/autoconf/programs.m4:40 +m4_location(_AC_CHECK_PROG)../../lib/autoconf/programs.m4:93 T27,29 -m4_location(AC_SEARCH_LIBS)../../lib/autoconf/libs.m4:47 +m4_location(AC_SEARCH_LIBS)../../lib/autoconf/libs.m4:71 T20,374 AC_CONFIG_LIBOBJ_DIR_m4_defun_once([AC_CONFIG_LIBOBJ_DIR], [m4_divert_text([DEFAULTS], [ac_config_libobj_dir=$1])], m4_if(_m4_divert_dump, [], [[_m4_defun_pro([AC_CONFIG_LIBOBJ_DIR])m4_unquote(], [)_m4_defun_epi([AC_CONFIG_LIBOBJ_DIR])]], @@ -10715,7 +10715,7 @@ AC_CHECK_FUNCS_m4_defun_pro([$0])m4_map_args_w([$1], [_AH_CHECK_FUNC(], [)])AS_F [$3])dnl]) []_m4_defun_epi([$0]) T19,33 -m4_location(_AC_FC)../../lib/autoconf/fortran.m4:167 +m4_location(_AC_FC)../../lib/autoconf/fortran.m4:170 T11,183 AC_IRIX_SUN_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_IRIX_SUN' is obsolete. You should run autoupdate.])dnl @@ -10760,7 +10760,7 @@ m4_include(autoconf/oldnames.m4) F6,6 regexpregexp T27,28 -m4_location(AC_PROG_CC_C99)../../lib/autoconf/c.m4:1370 +m4_location(AC_PROG_CC_C99)../../lib/autoconf/c.m4:1373 T17,64 _m4_divert_unsafem4_fatal([$0: cannot change diversion to `$1' inside m4_expand]) T8,99 @@ -10854,7 +10854,7 @@ m4_sysvalsysval T28,33 m4_location(AC_MAJOR_HEADER)../../lib/autoconf/oldnames.m4:65 T23,34 -m4_location(AC_ARG_VAR)../../lib/autoconf/general.m4:1511 +m4_location(AC_ARG_VAR)../../lib/autoconf/general.m4:1522 T13,91 AS_SET_STATUS_m4_defun_pro([$0])AS_REQUIRE([_AS_EXIT_PREPARE])[]as_fn_set_status $1[]_m4_defun_epi([$0]) T14,127 @@ -10868,11 +10868,11 @@ ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ ac_compiler_gnu=$ac_cv_objc_compiler_gnu T25,31 -m4_location(_AC_TYPE_INT)../../lib/autoconf/types.m4:671 +m4_location(_AC_TYPE_INT)../../lib/autoconf/types.m4:685 T30,31 -m4_location(AC_TYPE_UINTPTR_T)../../lib/autoconf/types.m4:366 +m4_location(AC_TYPE_UINTPTR_T)../../lib/autoconf/types.m4:384 T31,34 -m4_location(AC_CONFIG_AUX_DIRS)../../lib/autoconf/general.m4:1688 +m4_location(AC_CONFIG_AUX_DIRS)../../lib/autoconf/general.m4:1718 T22,527 _AS_VAR_APPEND_PREPARE_m4_defun_pro([$0])AS_FUNCTION_DESCRIBE([as_fn_append], [VAR VALUE], [Append the text in VALUE to the end of the definition contained in @@ -10900,7 +10900,7 @@ AC_FUNC_VFORK_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_FUNC_VFOR You should run autoupdate.])dnl m4_if($#, 0, [AC_FUNC_FORK], [AC_FUNC_FORK($@)])[]_m4_defun_epi([$0]) T26,34 -m4_location(_AC_TOOL_WARN)../../lib/autoconf/programs.m4:188 +m4_location(_AC_TOOL_WARN)../../lib/autoconf/programs.m4:193 T18,371 AC_SYS_INTERPRETER_m4_defun_pro([$0])AC_CACHE_CHECK(whether @%:@! works in shell scripts, ac_cv_sys_interpreter, [echo '#! /bin/cat @@ -10921,7 +10921,7 @@ AC_LANG_CALL(Go)AC_LANG_PROGRAM([$1 m4_if([$2], [main], , [func $2()])],[$2()]) T35,34 -m4_location(AC_MSG_RESULT_UNQUOTED)../../lib/autoconf/general.m4:2273 +m4_location(AC_MSG_RESULT_UNQUOTED)../../lib/autoconf/general.m4:2276 T15,77 _AC_LANG_ABBREV_m4_defun_pro([$0])_AC_LANG_DISPATCH([$0], _AC_LANG, $@)[]_m4_defun_epi([$0]) T15,550 @@ -10940,9 +10940,9 @@ if test $ac_cv_func_strcoll_works = yes; then fi []_m4_defun_epi([$0]) T33,34 -m4_location(_AC_FC_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1638 +m4_location(_AC_FC_IMPLICIT_NONE)../../lib/autoconf/fortran.m4:1670 T24,28 -m4_location(AC_C_INLINE)../../lib/autoconf/c.m4:1621 +m4_location(AC_C_INLINE)../../lib/autoconf/c.m4:1656 T29,1130 _AC_PROG_PREPROC_WORKS_IFELSE_m4_defun_pro([$0])ac_preproc_ok=false for ac_[]_AC_LANG_ABBREV[]_preproc_warn_flag in '' yes @@ -11098,13 +11098,13 @@ AC_DIAGNOSEm4_warn($@) T17,0 m4_pattern_forbid T24,34 -m4_location(_AC_RUN_LOG)../../lib/autoconf/general.m4:2298 +m4_location(_AC_RUN_LOG)../../lib/autoconf/general.m4:2303 T30,33 -m4_location(_AC_INIT_DIRCHECK)../../lib/autoconf/general.m4:491 +m4_location(_AC_INIT_DIRCHECK)../../lib/autoconf/general.m4:502 T33,34 -m4_location(AC_SYS_POSIX_TERMIOS)../../lib/autoconf/specific.m4:292 +m4_location(AC_SYS_POSIX_TERMIOS)../../lib/autoconf/specific.m4:302 T27,34 -m4_location(AC_CHECK_PROGS)../../lib/autoconf/programs.m4:109 +m4_location(AC_CHECK_PROGS)../../lib/autoconf/programs.m4:115 T9,69 m4_assertm4_if(m4_eval([$1]), 0, [m4_fatal([assert failed: $1], [$2])]) @@ -11150,7 +11150,7 @@ m4_pushdefpushdef T27,32 m4_location(AC_LANG_ERLANG)../../lib/autoconf/erlang.m4:112 T22,34 -m4_location(AC_EMXOS2)../../lib/autoconf/specific.m4:335 +m4_location(AC_EMXOS2)../../lib/autoconf/specific.m4:342 T21,140 AC_FC_LIBRARY_LDFLAGS_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_FC])dnl AC_LANG_PUSH(Fortran)dnl @@ -11184,9 +11184,9 @@ _AC_CANONICAL_SPLIT(build) m4_ifdef([_m4_diverting([AC_CANONICAL_BUILD])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([AC_CANONICAL_BUILD],], [, _m4_divert_dump)]])) T39,31 -m4_location(_AC_TYPE_LONG_LONG_SNIPPET)../../lib/autoconf/types.m4:474 +m4_location(_AC_TYPE_LONG_LONG_SNIPPET)../../lib/autoconf/types.m4:498 T28,33 -m4_location(AC_HEADER_MAJOR)../../lib/autoconf/headers.m4:509 +m4_location(AC_HEADER_MAJOR)../../lib/autoconf/headers.m4:531 T17,395 _AC_STRUCT_DIRENT_m4_defun_pro([$0]) AC_REQUIRE([AC_HEADER_DIRENT]) @@ -11217,7 +11217,7 @@ _AS_ECHO([$as_me: $1], [$2]);}], T13,127 AC_MSG_NOTICE_m4_defun_pro([$0])AS_REQUIRE([_AS_ME_PREPARE])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T25,34 -m4_location(AC_PATH_PROG)../../lib/autoconf/programs.m4:155 +m4_location(AC_PATH_PROG)../../lib/autoconf/programs.m4:158 T20,53 m4_divert_stack_pushm4_pushdef([_m4_divert_stack], m4_location[: $1: $2]) T17,105 @@ -11234,12 +11234,12 @@ T9,75 AC_BEFOREm4_provide_if([$2], [m4_warn([syntax], [$2 was called before $1])]) T37,34 -m4_location(AC_USE_SYSTEM_EXTENSIONS)../../lib/autoconf/specific.m4:368 +m4_location(AC_USE_SYSTEM_EXTENSIONS)../../lib/autoconf/specific.m4:422 T15,67 AC_LANG_PREPROCAC_LANG_COMPILER_REQUIRE()dnl _AC_LANG_DISPATCH([$0], _AC_LANG, $@) T28,36 -m4_location(AC_FUNC_STRCOLL)../../lib/autoconf/functions.m4:1725 +m4_location(AC_FUNC_STRCOLL)../../lib/autoconf/functions.m4:1739 T23,39 m4_expansion_stack_pushm4_pushdef([_m4_expansion_stack], [$1]) T22,3 @@ -11274,7 +11274,7 @@ AC_LANG_OBJC_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_LANG_OBJC' You should run autoupdate.])dnl AC_LANG(Objective C)[]_m4_defun_epi([$0]) T34,30 -m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1948 +m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1962 T11,30 AC_MSG_WARNAS_MESSAGE([WARNING: $1], [2]) T13,26 @@ -11302,7 +11302,7 @@ AS_LITERAL_WORD_IF([$2], T20,36 m4_location(AC_MMAP)../../lib/autoconf/functions.m4:1354 T26,34 -m4_location(AC_CHECK_FUNC)../../lib/autoconf/functions.m4:59 +m4_location(AC_CHECK_FUNC)../../lib/autoconf/functions.m4:68 T30,71 AC_LANG_PREPROC(Objective C++)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_OBJCXXCPP])[]_m4_defun_epi([$0]) T24,34 @@ -11328,7 +11328,7 @@ m4_map_argsm4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [2], [$1([$2])[]], [_m4_foreach([$1(], [)], $@)]) T26,28 -m4_location(_AC_C_STD_TRY)../../lib/autoconf/c.m4:1167 +m4_location(_AC_C_STD_TRY)../../lib/autoconf/c.m4:1192 T19,288 _m4_set_contents_1cm4_ifdef([_m4_set([$1])], [m4_set_contains([$1], _m4_defn([_m4_set([$1])]), @@ -11350,13 +11350,13 @@ AC_TYPE_INT64_T_m4_defun_pro([$0])_AC_TYPE_INT(64)[]_m4_defun_epi([$0]) F8,5 m4_shiftshift T28,33 -m4_location(_AC_PROG_FC_C_O)../../lib/autoconf/fortran.m4:438 +m4_location(_AC_PROG_FC_C_O)../../lib/autoconf/fortran.m4:460 T37,33 -m4_location(_AC_CHECK_HEADER_MONGREL)../../lib/autoconf/headers.m4:129 +m4_location(_AC_CHECK_HEADER_MONGREL)../../lib/autoconf/headers.m4:141 T27,28 -m4_location(AC_PROG_OBJCXX)../../lib/autoconf/c.m4:1010 +m4_location(AC_PROG_OBJCXX)../../lib/autoconf/c.m4:1039 T38,33 -m4_location(AC_LANG_COMPILER(Fortran))../../lib/autoconf/fortran.m4:261 +m4_location(AC_LANG_COMPILER(Fortran))../../lib/autoconf/fortran.m4:262 T16,452 _m4_require_callm4_pushdef([_m4_divert_grow], m4_decr(_m4_divert_grow))m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])m4_divert_push(_m4_divert_grow, [-])m4_if([$2], [], [$1], [$2]) m4_provide_if([$1], [m4_set_remove([_m4_provide], [$1])], @@ -11480,7 +11480,7 @@ fi T9,23 AC_DEFINE_AC_DEFINE_Q([_$0], $@) T24,33 -m4_location(_AC_FC_MAIN)../../lib/autoconf/fortran.m4:859 +m4_location(_AC_FC_MAIN)../../lib/autoconf/fortran.m4:886 T23,27 m4_location(AC_LANG_GO)../../lib/autoconf/go.m4:44 T13,160 @@ -11516,7 +11516,7 @@ m4_location(AC_INLINE)../../lib/autoconf/oldnames.m4:61 T7,65 _m4_maxm4_eval((([$1]) > ([$2])) * ([$1]) + (([$1]) <= ([$2])) * ([$2])) T28,34 -m4_location(AC_F77_WRAPPERS)../../lib/autoconf/fortran.m4:1071 +m4_location(AC_F77_WRAPPERS)../../lib/autoconf/fortran.m4:1076 F8,8 __file____file__ T18,2 @@ -11534,9 +11534,9 @@ m4_bregexpregexp F7,7 pushdefpushdef T32,35 -m4_location(AC_FUNC_FNMATCH_GNU)../../lib/autoconf/functions.m4:582 +m4_location(AC_FUNC_FNMATCH_GNU)../../lib/autoconf/functions.m4:587 T36,32 -m4_location(AC_ERLANG_SUBST_LIB_DIR)../../lib/autoconf/erlang.m4:241 +m4_location(AC_ERLANG_SUBST_LIB_DIR)../../lib/autoconf/erlang.m4:260 T15,345 _AC_COMPUTE_INT_m4_defun_pro([$0])AC_COMPUTE_INT([$2], [$1], [$3], [$4]) AC_DIAGNOSE([obsolete], @@ -11658,7 +11658,7 @@ AC_SUBST([ERLANG_LIB_VER_$1], [$ac_cv_erlang_lib_ver_$1]) AS_IF([test "$ac_cv_erlang_lib_dir_$1" = "not found"], [$3], [$2]) []_m4_defun_epi([$0]) T32,33 -m4_location(AC_DECL_SYS_SIGLIST)../../lib/autoconf/specific.m4:39 +m4_location(AC_DECL_SYS_SIGLIST)../../lib/autoconf/specific.m4:47 T14,103 _AS_TR_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_TR_SH_PREPARE])AS_REQUIRE([_AS_TR_CPP_PREPARE])[]_m4_defun_epi([$0]) T14,81 @@ -11693,7 +11693,7 @@ extern char *tzname[]; fi []_m4_defun_epi([$0]) T31,28 -m4_location(AC_C_CHAR_UNSIGNED)../../lib/autoconf/c.m4:1425 +m4_location(AC_C_CHAR_UNSIGNED)../../lib/autoconf/c.m4:1438 T24,3 _m4_divert(HELP_VAR_END)105 T10,24 @@ -11701,7 +11701,7 @@ AN_LIBRARYAN_OUTPUT([library], $@) T11,25 AN_FUNCTIONAN_OUTPUT([function], $@) T39,34 -m4_location(AC_DISABLE_OPTION_CHECKING)../../lib/autoconf/general.m4:1497 +m4_location(AC_DISABLE_OPTION_CHECKING)../../lib/autoconf/general.m4:1499 T12,47 AS_VAR_ARITHas_fn_arith $2 && AS_VAR_SET([$1], [$as_val])[] T12,197 @@ -11758,7 +11758,7 @@ else fi T24,27 -m4_location(AC_PROG_CXX)../../lib/autoconf/c.m4:694 +m4_location(AC_PROG_CXX)../../lib/autoconf/c.m4:730 T10,520 _AC_PATH_X_m4_defun_pro([$0])AC_CACHE_VAL(ac_cv_have_x, [# One or both of the vars are not set, and there is no cached value. @@ -11824,13 +11824,13 @@ fi AC_LANG_POP(Fortran)dnl []_m4_defun_epi([$0]) T33,29 -m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:954 +m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:961 T25,34 -m4_location(_AC_DO_LIMIT)../../lib/autoconf/general.m4:2412 +m4_location(_AC_DO_LIMIT)../../lib/autoconf/general.m4:2414 T27,33 m4_location(AC_LONG_DOUBLE)../../lib/autoconf/oldnames.m4:63 T39,28 -m4_location(AC_C_FLEXIBLE_ARRAY_MEMBER)../../lib/autoconf/c.m4:1846 +m4_location(AC_C_FLEXIBLE_ARRAY_MEMBER)../../lib/autoconf/c.m4:1876 T23,106 _AH_CHECK_HEADER_DIRENTAH_TEMPLATE(AS_TR_CPP([HAVE_$1]), [Define to 1 if you have the <$1> header file, and it defines `DIR'.]) @@ -11845,11 +11845,11 @@ if test "$ERLC" = "not found"; then fi []_m4_defun_epi([$0]) T33,28 -m4_location(AC_LANG_COMPILER(Go))../../lib/autoconf/go.m4:143 +m4_location(AC_LANG_COMPILER(Go))../../lib/autoconf/go.m4:144 T20,3 _AC_LANG_ABBREV(C++)cxx T26,34 -m4_location(AC_ARG_ENABLE)../../lib/autoconf/general.m4:1462 +m4_location(AC_ARG_ENABLE)../../lib/autoconf/general.m4:1472 T34,122 _AC_LANG_IO_PROGRAM(Objective C++)AC_LANG_PROGRAM([@%:@include ], [FILE *f = fopen ("conftest.out", "w"); @@ -11878,10 +11878,10 @@ fi []_m4_defun_epi([$0]) T13,42 m4_mapall_sepm4_if([$3], [], [], [_$0([$1], [$2], $3)]) -T25,29 -m4_location(AC_CHECK_LIB)../../lib/autoconf/libs.m4:99 +T25,30 +m4_location(AC_CHECK_LIB)../../lib/autoconf/libs.m4:117 T21,34 -m4_location(_AC_EVAL)../../lib/autoconf/general.m4:2422 +m4_location(_AC_EVAL)../../lib/autoconf/general.m4:2424 F11,11 changequotechangequote T16,118 @@ -11893,7 +11893,7 @@ AC_ST_RDEV_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_ST_RDEV' is You should run autoupdate.])dnl m4_if($#, 0, [AC_STRUCT_ST_RDEV], [AC_STRUCT_ST_RDEV($@)])[]_m4_defun_epi([$0]) T25,34 -m4_location(AC_PROG_LN_S)../../lib/autoconf/programs.m4:799 +m4_location(AC_PROG_LN_S)../../lib/autoconf/programs.m4:807 T9,26 m4_ifndefm4_ifdef([$1], [$3], [$2]) T18,144 @@ -11920,7 +11920,7 @@ _AC_LANG_IO_PROGRAM(Objective C)AC_LANG_PROGRAM([@%:@include ], T27,36 m4_location(AM_FUNC_STRTOD)../../lib/autoconf/functions.m4:1619 T27,35 -m4_location(AC_FUNC_FSEEKO)../../lib/autoconf/functions.m4:601 +m4_location(AC_FUNC_FSEEKO)../../lib/autoconf/functions.m4:617 T24,495 _AC_CHECK_HEADER_PREPROC_m4_defun_pro([$0])AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_header_preproc], [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_header_preproc], @@ -11937,7 +11937,7 @@ AC_FATALm4_fatal($@) T22,33 m4_location(AC_FIND_X)../../lib/autoconf/oldnames.m4:57 T22,34 -m4_location(AC_CYGWIN)../../lib/autoconf/specific.m4:321 +m4_location(AC_CYGWIN)../../lib/autoconf/specific.m4:328 T7,108 m4_joinm4_if([$#], [1], [], [$#], [2], [[$2]], @@ -12321,7 +12321,7 @@ DUALCASE=1; export DUALCASE # for MKS sh _$0 T30,31 -m4_location(AC_TYPE_UINTMAX_T)../../lib/autoconf/types.m4:327 +m4_location(AC_TYPE_UINTMAX_T)../../lib/autoconf/types.m4:339 T16,2 _m4_divert(KILL)-1 T18,211 @@ -12333,11 +12333,11 @@ m4_foreachm4_if([$2], [], [], [m4_pushdef([$1])_$0([m4_define([$1],], [)$3], [], $2)m4_popdef([$1])]) T20,34 -m4_location(AC_WITH)../../lib/autoconf/general.m4:1492 +m4_location(AC_WITH)../../lib/autoconf/general.m4:1493 T20,33 m4_location(AC_WARN)../../lib/autoconf/oldnames.m4:33 T28,34 -m4_location(AC_FC_PP_DEFINE)../../lib/autoconf/fortran.m4:1302 +m4_location(AC_FC_PP_DEFINE)../../lib/autoconf/fortran.m4:1337 T9,265 _AS_QUOTEm4_cond([m4_index([$1], [\])], [-1], [_AS_QUOTE_MODERN], [m4_eval(m4_index(m4_translit([[$1]], [$], [\]), [\\]) >= 0)], @@ -12450,11 +12450,11 @@ m4_include(m4sugar/version.m4) T28,31 m4_location(AC_TYPE_INT32_T)../../lib/autoconf/types.m4:626 T30,32 -m4_location(AC_STRUCT_ST_RDEV)../../lib/autoconf/types.m4:1011 +m4_location(AC_STRUCT_ST_RDEV)../../lib/autoconf/types.m4:1019 T37,32 -m4_location(AC_LANG_COMPILER(Erlang))../../lib/autoconf/erlang.m4:167 +m4_location(AC_LANG_COMPILER(Erlang))../../lib/autoconf/erlang.m4:168 T32,27 -m4_location(AC_LANG_COMPILER(C))../../lib/autoconf/c.m4:429 +m4_location(AC_LANG_COMPILER(C))../../lib/autoconf/c.m4:430 T11,43 AC_OBSOLETEAC_DIAGNOSE([obsolete], [$1 is obsolete$2]) T14,181 @@ -12471,19 +12471,19 @@ if test $ac_cv_type_uid_t = no; then fi []_m4_defun_epi([$0]) T33,33 -m4_location(_AC_PROG_FC_V_OUTPUT)../../lib/autoconf/fortran.m4:497 +m4_location(_AC_PROG_FC_V_OUTPUT)../../lib/autoconf/fortran.m4:571 T23,33 -m4_location(AC_PROG_FC)../../lib/autoconf/fortran.m4:378 +m4_location(AC_PROG_FC)../../lib/autoconf/fortran.m4:391 T33,27 -m4_location(AC_LANG_PREPROC(C++))../../lib/autoconf/c.m4:627 +m4_location(AC_LANG_PREPROC(C++))../../lib/autoconf/c.m4:628 T44,27 -m4_location(AC_LANG_COMPILER(Objective C++))../../lib/autoconf/c.m4:992 +m4_location(AC_LANG_COMPILER(Objective C++))../../lib/autoconf/c.m4:993 T28,34 -m4_location(_AC_EVAL_STDERR)../../lib/autoconf/general.m4:2432 +m4_location(_AC_EVAL_STDERR)../../lib/autoconf/general.m4:2434 T26,30 -m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1939 +m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1941 T26,32 -m4_location(AC_LINK_FILES)../../lib/autoconf/status.m4:938 +m4_location(AC_LINK_FILES)../../lib/autoconf/status.m4:954 T14,73 _m4_mapall_sepm4_apply([$1], [$3])_m4_foreach([m4_apply([$2[]$1],], [)], m4_shift2($@)) T9,132 @@ -12499,7 +12499,7 @@ AC_CONFIG_AUX_DIR_m4_defun_pro([$0])AC_CONFIG_AUX_DIRS($1 "$srcdir"/$1)[]_m4_def F10,7 m4_traceontraceon T27,27 -m4_location(ac_cv_prog_gxx)../../lib/autoconf/c.m4:674 +m4_location(ac_cv_prog_gxx)../../lib/autoconf/c.m4:675 T11,1061 _AC_SRCDIRSac_builddir=. @@ -12536,7 +12536,7 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix T26,34 -m4_location(AC_CHECK_TOOL)../../lib/autoconf/programs.m4:220 +m4_location(AC_CHECK_TOOL)../../lib/autoconf/programs.m4:236 T13,52 m4_cr_LettersabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ T18,457 @@ -12562,7 +12562,7 @@ _AC_FC_DUMMY_MAIN($@) AC_LANG_POP(Fortran 77)dnl []_m4_defun_epi([$0]) T28,31 -m4_location(AC_CHECK_MEMBER)../../lib/autoconf/types.m4:888 +m4_location(AC_CHECK_MEMBER)../../lib/autoconf/types.m4:904 T24,117 _AC_LANG_OPENMP(Fortran) program main @@ -12573,7 +12573,7 @@ _AC_LANG_OPENMP(Fortran) end T32,30 -m4_location(_AC_LANG_IO_PROGRAM)../../lib/autoconf/lang.m4:265 +m4_location(_AC_LANG_IO_PROGRAM)../../lib/autoconf/lang.m4:266 T9,75 m4_beforem4_provide_if([$2], [m4_warn([syntax], [$2 was called before $1])]) @@ -12834,16 +12834,16 @@ AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS"])])dnl []_m4_defun_epi([$0]) T31,34 -m4_location(_AC_COMPILE_IFELSE)../../lib/autoconf/general.m4:2590 +m4_location(_AC_COMPILE_IFELSE)../../lib/autoconf/general.m4:2598 T43,31 -m4_location(AC_TYPE_UNSIGNED_LONG_LONG_INT)../../lib/autoconf/types.m4:547 +m4_location(AC_TYPE_UNSIGNED_LONG_LONG_INT)../../lib/autoconf/types.m4:562 T28,35 -m4_location(AC_FUNC_GETPGRP)../../lib/autoconf/functions.m4:828 +m4_location(AC_FUNC_GETPGRP)../../lib/autoconf/functions.m4:840 T7,93 _AS_BOXm4_if(m4_index(m4_translit([[$1]], [`\"], [$$$]), [$]), [-1], [$0_LITERAL], [$0_INDIR])($@) T35,33 -m4_location(AC_CONFIG_COMMANDS_PRE)../../lib/autoconf/status.m4:1053 +m4_location(AC_CONFIG_COMMANDS_PRE)../../lib/autoconf/status.m4:1055 T8,189 _m4_wrapm4_ifdef([$0_text], [m4_define([$0_text], [$1]_m4_defn([$0_text])[$2])], @@ -12924,7 +12924,7 @@ AC_TYPE_MBSTATE_T_m4_defun_pro([$0])AC_CACHE_CHECK([for mbstate_t], ac_cv_type_m [Define to a type if does not define.]) fi[]_m4_defun_epi([$0]) T28,30 -m4_location(_AC_LANG_PREFIX)../../lib/autoconf/lang.m4:149 +m4_location(_AC_LANG_PREFIX)../../lib/autoconf/lang.m4:150 T28,4 _AC_LANG_ABBREV(Objective C)objc T14,87 @@ -12932,7 +12932,7 @@ AC_PROG_CC_C89_m4_defun_pro([$0]) AC_REQUIRE([AC_PROG_CC])dnl _AC_PROG_CC_C89 []_m4_defun_epi([$0]) T22,33 -m4_location(AC_OUTPUT)../../lib/autoconf/status.m4:1239 +m4_location(AC_OUTPUT)../../lib/autoconf/status.m4:1244 T14,1273 _AC_CACHE_DUMP# The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -13024,13 +13024,13 @@ _ACEOF esac []_m4_defun_epi([$0]) T33,33 -m4_location(_AC_CHECK_HEADER_OLD)../../lib/autoconf/headers.m4:215 +m4_location(_AC_CHECK_HEADER_OLD)../../lib/autoconf/headers.m4:218 T23,33 -m4_location(AC_FOREACH)../../lib/autoconf/general.m4:194 +m4_location(AC_FOREACH)../../lib/autoconf/general.m4:196 T38,31 -m4_location(AC_TYPE_LONG_DOUBLE_WIDER)../../lib/autoconf/types.m4:414 +m4_location(AC_TYPE_LONG_DOUBLE_WIDER)../../lib/autoconf/types.m4:447 T50,35 -m4_location(AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK)../../lib/autoconf/functions.m4:849 +m4_location(AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK)../../lib/autoconf/functions.m4:881 F9,6 m4_definedefine T24,1910 @@ -13724,7 +13724,7 @@ $2]) F7,7 traceontraceon T32,31 -m4_location(AC_ERLANG_PATH_ERLC)../../lib/autoconf/erlang.m4:49 +m4_location(AC_ERLANG_PATH_ERLC)../../lib/autoconf/erlang.m4:58 T22,496 AC_PRESERVE_HELP_ORDER_m4_defun_pro([$0])m4_divert_once([HELP_ENABLE], [[ Optional Features and Packages: @@ -13830,7 +13830,7 @@ _AC_FC_IMPLICIT_NONE($@) AC_LANG_POP([Fortran 77])dnl []_m4_defun_epi([$0]) T29,30 -m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1108 +m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1115 T8,198 _m4_qlenm4_define([m4_qlen-$1], m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])], @@ -13854,9 +13854,9 @@ T10,72 m4_reversem4_if([$#], [0], [], [$#], [1], [[$1]], [$0(m4_shift($@)), [$1]]) T29,34 -m4_location(AC_PROG_MAKE_SET)../../lib/autoconf/programs.m4:818 +m4_location(AC_PROG_MAKE_SET)../../lib/autoconf/programs.m4:844 T29,31 -m4_location(AC_CHECK_MEMBERS)../../lib/autoconf/types.m4:921 +m4_location(AC_CHECK_MEMBERS)../../lib/autoconf/types.m4:923 T31,53 _AC_FILE_DEPENDENCY_TRACE_COLONAC_FILE_DEPENDENCY_TRACE(m4_translit([$1], [:], [,])) T13,1 @@ -14067,9 +14067,9 @@ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) T20,68 AC_LANG_PREPROC(C++)_m4_defun_pro([$0])AC_REQUIRE([AC_PROG_CXXCPP])[]_m4_defun_epi([$0]) T40,30 -m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1697 +m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1757 T27,34 -m4_location(AC_CACHE_CHECK)../../lib/autoconf/general.m4:2052 +m4_location(AC_CACHE_CHECK)../../lib/autoconf/general.m4:2059 T19,34 AC_LANG_PROGRAM(Go)package main $1 @@ -14146,11 +14146,11 @@ dnl SVR4 -Xc -D__EXTENSIONS__ T11,54 AS_VAR_COPYAS_LITERAL_WORD_IF([$1[]$2], [$1=$$2], [eval $1=\$$2]) T29,31 -m4_location(AC_C_LONG_DOUBLE)../../lib/autoconf/types.m4:452 +m4_location(AC_C_LONG_DOUBLE)../../lib/autoconf/types.m4:464 F3,3 lenlen T29,33 -m4_location(AC_HEADER_RESOLV)../../lib/autoconf/headers.m4:543 +m4_location(AC_HEADER_RESOLV)../../lib/autoconf/headers.m4:558 T17,229 m4_cr_not_letters  !"#*%&'()$+,./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`{|}~- @@ -14200,7 +14200,7 @@ AC_DYNIX_SEQ_m4_defun_pro([$0])AC_DIAGNOSE([obsolete], [The macro `AC_DYNIX_SEQ' You should run autoupdate.])dnl AC_FUNC_GETMNTENT[]_m4_defun_epi([$0]) T28,34 -m4_location(AC_FC_PP_SRCEXT)../../lib/autoconf/fortran.m4:1240 +m4_location(AC_FC_PP_SRCEXT)../../lib/autoconf/fortran.m4:1287 T6,158 popdefm4_if([$#], [0], [[$0]], [$#], [1], [m4_ifdef([$1], [_m4_popdef([$1])], @@ -14211,7 +14211,7 @@ m4_location(AC_ALLOCA)../../lib/autoconf/functions.m4:417 T19,34 m4_location(AC_AIX)../../lib/autoconf/specific.m4:436 T42,27 -m4_location(AC_LANG_COMPILER(Objective C))../../lib/autoconf/c.m4:853 +m4_location(AC_LANG_COMPILER(Objective C))../../lib/autoconf/c.m4:854 T17,117 m4_include_uniquem4_ifdef([m4_include($1)], [m4_warn([syntax], [file `$1' included several times])])dnl @@ -14308,9 +14308,9 @@ AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5, ($[3]), rm -f conftest* []_m4_defun_epi([$0]) T25,32 -m4_location(AC_STRUCT_TM)../../lib/autoconf/types.m4:1026 +m4_location(AC_STRUCT_TM)../../lib/autoconf/types.m4:1041 T29,35 -m4_location(AC_REPLACE_FUNCS)../../lib/autoconf/functions.m4:132 +m4_location(AC_REPLACE_FUNCS)../../lib/autoconf/functions.m4:133 T18,188 AC_ERLANG_NEED_ERL_m4_defun_pro([$0])AC_ERLANG_PATH_ERL([not found], [$1]) if test "$ERL" = "not found"; then diff --git a/externals/autotools/share/autoconf/autom4te.cfg b/externals/autotools/share/autoconf/autom4te.cfg index 370de49b973..0fe51ebad71 100644 --- a/externals/autotools/share/autoconf/autom4te.cfg +++ b/externals/autotools/share/autoconf/autom4te.cfg @@ -106,7 +106,7 @@ end-language: "Autoreconf-preselections" # This intermediate language is used by aclocal to build aclocal.m4. begin-language: "Autoconf-without-aclocal-m4" -args: --prepend-include '/ADL/fpalacios/SU2/trunk/externals/autotools/share/autoconf' +args: --prepend-include '/Users/fpalacios/SU2/trunk/externals/autotools/share/autoconf' args: --cache=autom4te.cache args: autoconf/autoconf.m4f args: acsite.m4? @@ -133,7 +133,7 @@ end-language: "Autoconf" ## -------- ## begin-language: "Autotest" -args: --prepend-include '/ADL/fpalacios/SU2/trunk/externals/autotools/share/autoconf' +args: --prepend-include '/Users/fpalacios/SU2/trunk/externals/autotools/share/autoconf' args: autotest/autotest.m4f args: package.m4? args: local.at? @@ -147,7 +147,7 @@ end-language: "Autotest" ## ---- ## begin-language: "M4sh" -args: --prepend-include '/ADL/fpalacios/SU2/trunk/externals/autotools/share/autoconf' +args: --prepend-include '/Users/fpalacios/SU2/trunk/externals/autotools/share/autoconf' args: m4sugar/m4sh.m4f args: --mode 777 args: --language M4sugar @@ -159,7 +159,7 @@ end-language: "M4sh" ## ------- ## begin-language: "M4sugar" -args: --prepend-include '/ADL/fpalacios/SU2/trunk/externals/autotools/share/autoconf' +args: --prepend-include '/Users/fpalacios/SU2/trunk/externals/autotools/share/autoconf' args: m4sugar/m4sugar.m4f args: --warnings syntax end-language: "M4sugar" diff --git a/externals/autotools/share/autoconf/autotest/autotest.m4f b/externals/autotools/share/autoconf/autotest/autotest.m4f index cebada80b30..a309ef040c0 100644 --- a/externals/autotools/share/autoconf/autotest/autotest.m4f +++ b/externals/autotools/share/autoconf/autotest/autotest.m4f @@ -1,4 +1,4 @@ -# This is a frozen state file generated by GNU M4 1.4.13 +# This is a frozen state file generated by GNU M4 1.4.6 V1 Q1,1 [] @@ -45,9 +45,9 @@ m4_divert_push([TEST_SCRIPT])dnl T8,46 AT_SETUPm4_fatal([AT_SETUP: missing AT_INIT detected]) T27,30 -m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1122 +m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1125 T20,29 -m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:585 +m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:586 T21,479 _AS_VAR_ARITH_PREPARE_m4_defun_pro([$0])AS_FUNCTION_DESCRIBE([as_fn_arith], [ARG...], [Perform arithmetic evaluation on the ARGs, and store the result in @@ -71,7 +71,7 @@ m4_map_args_sepm4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [4], [$1[$4]$2[]], [$1[$4]$2[]_m4_foreach([$3[]$1], [$2], m4_shift3($@))]) T22,30 -m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1090 +m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1092 T16,3 _m4_divert(HELP)300 T8,150 @@ -129,7 +129,7 @@ T7,84 _m4_for$4[$1]$5[]m4_if([$1], [$2], [], [$0(m4_eval([$1 + $3]), [$2], [$3], [$4], [$5])]) T27,34 -m4_location(_AT_ARG_OPTION)../../lib/autotest/general.m4:1674 +m4_location(_AT_ARG_OPTION)../../lib/autotest/general.m4:1746 T12,78 m4_foreach_wm4_pushdef([$1])m4_map_args_w([$2], [m4_define([$1],], [)$3])m4_popdef([$1]) @@ -144,7 +144,7 @@ _m4_dumpdefm4_if([$#], [0], [m4_fatal([$0: missing argument])], T20,3 _m4_divert(HELP_END)305 T25,30 -m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1981 +m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1984 T14,131 m4_set_add_allm4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1]) + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@)))) @@ -162,7 +162,7 @@ AS_VAR_TEST_SETAS_LITERAL_WORD_IF([$1], T7,111 AS_EXIT_m4_defun_pro([$0])AS_REQUIRE([_AS_EXIT_PREPARE])[]as_fn_exit m4_ifval([$1], [$1], [$][?])[]_m4_defun_epi([$0]) T27,30 -m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1793 +m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1800 T13,175 m4_defun_initm4_define([$1], [$3[]])m4_defun([$1], [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl @@ -203,14 +203,14 @@ m4_version_compare_m4_list_cmp_raw(_m4_version_unletter([$1]), _m4_version_unlet T32,0 m4_include(autotest/specific.m4) T31,30 -m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1167 +m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1213 T25,1 _m4_divert(M4SH-SANITIZE)4 T10,120 _AS_ESCAPEm4_if(m4_index(m4_translit([[$1]], [$3], [$2$2$2$2]), [$2]), [-1], [$0_], [m4_bpatsubst])([$1], [[$2$3]], [\\\&]) T29,29 -m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:568 +m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:577 T15,165 _m4_set_add_allm4_if([$#], [2], [], [m4_ifdef([_m4_set([$1],$3)], [], @@ -269,7 +269,7 @@ _AS_IFelif $1; then : T13,15 AS_VAR_POPDEFm4_popdef([$1]) T23,29 -m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:385 +m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:389 F6,3 m4_lenlen T14,42 @@ -282,7 +282,7 @@ AS_VAR_GETAS_LITERAL_WORD_IF([$1], [$$1], [`eval 'as_val=${'_AS_ESCAPE([[$1]], [`], [\])'};AS_ECHO(["$as_val"])'`]) T29,30 -m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1223 +m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1250 F12,9 m4_debugmodedebugmode T10,280 @@ -300,7 +300,7 @@ m4_append_uniqm4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [], T15,0 _m4_divert_dump T27,30 -m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2066 +m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2068 T20,20 m4_PACKAGE_BUGREPORTbug-autoconf@gnu.org T22,38 @@ -343,7 +343,7 @@ _m4_append_uniqm4_ifdef([$1], [m4_append([$1], [$2], [$3])$4], [$5])], [m4_define([$1], [$2])$4]) T32,30 -m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1296 +m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1309 T20,201 _AS_BASENAME_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_EXPR_PREPARE])if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename @@ -401,7 +401,7 @@ m4_popdefm4_if([$#], [0], [[$0]], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)]) T21,29 -m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:671 +m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:672 T12,152 _m4_set_dumpm4_ifdef([_m4_set([$1])], [[$2]_m4_defn([_m4_set([$1])])_m4_popdef([_m4_set([$1],]_m4_defn( @@ -433,9 +433,9 @@ m4_case([$1], [m4_append([AT_xfail], [ $1 && at_xfail=yes])]) T31,29 -m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:807 +m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:820 T27,29 -m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:894 +m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:895 T14,142 _AT_CHECK_EXITm4_define([AT_ingroup])AS_ECHO(_AT_LINE_ESCAPED) >"$at_check_line_file" m4_ifval([$1], [($1) \ @@ -459,7 +459,7 @@ _AS_MKDIR_Pcase $as_dir in #( } || test -d "$as_dir" || AS_ERROR([cannot create directory $as_dir]) T39,30 -m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1315 +m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1324 T5,73 m4_dom4_if([$#], 0, [], [$#], 1, [$1[]], @@ -467,7 +467,7 @@ m4_dom4_if([$#], 0, [], F9,6 m4_substrsubstr T33,29 -m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:167 +m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:168 T18,8 m4_PACKAGE_TARNAMEautoconf T13,252 @@ -479,7 +479,7 @@ m4_set_removem4_set_contains([$1], [$2], [_m4_set_size([$1], T19,109 _m4_defun_epi_outer_m4_popdef([_m4_divert_dump], [_m4_diverting([$1])], [_m4_diverting])m4_divert_pop([GROW])m4_undivert([GROW]) T27,30 -m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1878 +m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1879 T15,58 m4_divert_stackm4_stack_foreach_sep_lifo([_m4_divert_stack], [], [], [ ]) @@ -490,9 +490,9 @@ AS_VAR_PUSHDEF_$0([$1], m4_expand([$2]))[] T14,130 AS_VAR_PUSHDEF_m4_defun_pro([$0])AS_REQUIRE([_AS_TR_SH_PREPARE])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T18,29 -m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:639 +m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:643 T31,30 -m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1767 +m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1775 F9,6 m4_syscmdsyscmd T28,44 @@ -532,7 +532,7 @@ __unix__ T17,77 AT_ARG_OPTION_ARG_m4_defun_pro([$0])_AT_ARG_OPTION([$1],[$2],1,[$3],[$4])[]_m4_defun_epi([$0]) T20,30 -m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1257 +m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1259 T14,109 m4_file_appendm4_syscmd([cat >>$1 <<_m4eof $2 @@ -548,7 +548,7 @@ m4_pushdef([$1], [$as_[$1]])], T15,49 m4_rename_forcem4_ifdef([$2], [_m4_undefine([$2])])m4_rename($@) T28,30 -m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1098 +m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1100 T9,222 m4_bmatchm4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], @@ -582,7 +582,7 @@ AT_DIFF_STDERR(ignore-nolog) T27,3 _m4_divert(VERSION_NOTICES)351 T26,29 -m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:649 +m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:650 T14,37 m4_PACKAGE_URLhttp://www.gnu.org/software/autoconf/ T11,62 @@ -2226,8 +2226,8 @@ m4_divert([KILL]) T16,103 AS_IDENTIFIER_IFm4_if(_$0(m4_if(m4_index([$1], [@]), [-1], [[$1]], [m4_bpatsubst([[$1]], [@&t@])])), [-], [$2], [$3]) -F11,7 -m4_maketempmkstemp +F11,8 +m4_maketempmaketemp T17,129 _AS_DETECT_EXPAND$1="m4_bpatsubst(m4_dquote(AS_ESCAPE(_m4_expand(m4_set_contents([$2], [ ])))), [\\\$LINENO\(.*\)$], [";$1=$$1$LINENO;$1=$$1"\1])" @@ -2237,7 +2237,7 @@ m4_nm4_if([$1], [$1 ]) T26,29 -m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:904 +m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:905 T8,22 AS_TR_SH_$0(m4_expand([$1]))[] T8,124 @@ -2259,7 +2259,7 @@ _m4_divert(HELP_TUNING_BEGIN)302 T22,3 _m4_divert(HELP_MODES)301 T21,30 -m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1826 +m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1828 T22,3 _m4_divert(HELP_OTHER)304 T9,35 @@ -2277,7 +2277,7 @@ m4_set_listcm4_set_map_sep([$1], [,]) F9,6 m4_divnumdivnum T30,30 -m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2121 +m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2140 T21,76 _m4_set_add_all_checkm4_if([$#], [2], [], [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))]) @@ -2328,8 +2328,8 @@ _AS_LITERAL_IF_m4_if(m4_translit([$1], [+]), [], [$0YES], m4_translit([$1], [$]), [], [m4_default], [$0NO]) F9,6 m4_formatformat -F10,7 -m4_mkstempmkstemp +F10,8 +m4_mkstempmaketemp T12,93 AT_COPYRIGHTAS_COPYRIGHT([$1])[]m4_divert_text([VERSION_NOTICES], [m4_default([$2], [m4_newline])([$1])]) @@ -2517,7 +2517,7 @@ m4_indirindir T12,1 _m4_divert()0 T31,30 -m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1845 +m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1849 F12,9 m4_changecomchangecom T20,40 @@ -2659,11 +2659,11 @@ m4_divert_pop[][]_m4_defun_epi([$0]) T11,17 m4_location__file__:__line__ T24,29 -m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:942 +m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:946 T22,30 AT_DIFF_STDERR(ignore)echo stderr:; cat "$at_stderr" T36,29 -m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:194 +m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:273 T11,54 m4_ifnblankm4_if(m4_translit([[$1]], [ ][ ][ ]), [], [$3], [$2]) @@ -2707,7 +2707,7 @@ m4_form4_pushdef([$1], m4_eval([$2]))m4_cond([m4_eval(([$3]) > ([$2]))], 1, T8,42 _AS_ECHO_AS_ECHO_UNQUOTED([_AS_QUOTE([$1])], [$2]) T25,29 -m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:790 +m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:792 T17,185 _AS_TR_SH_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_CR_PREPARE])# Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[[^_$as_cr_alnum]]%_%g'" @@ -2758,7 +2758,7 @@ _AS_CASE_DEFAULT [@%:@(] T7,30 AS_WARNAS_MESSAGE([WARNING: $1], [2]) T30,29 -m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:921 +m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:924 T17,490 _AS_TR_SH_LITERALm4_translit([[$1]], [*+[]][ @@ -2834,7 +2834,7 @@ m4_set_deletem4_ifdef([_m4_set([$1])], [_m4_set_size($1)], [_m4_popdef([_m4_set_size($1)])])]) T34,29 -m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:279 +m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:297 T12,10 m4_cr_digits0123456789 T17,17 @@ -2887,7 +2887,7 @@ m4_wrap([m4_popdef([_m4_divert_diversion])m4_ifdef( ]m4_divert_stack)])_m4_popdef([_m4_divert_stack])m4_divert_push([KILL])]) T21,29 -m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:883 +m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:887 T11,162 m4_dumpdefsm4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_stack_foreach_lifo([$1], [m4_dumpdef([$1])m4_ignore])], @@ -2909,13 +2909,13 @@ m4_n([$2])$1 () $3 } @%:@ $1[] T22,30 -m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1859 +m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1861 T8,28 _AS_CASE [@%:@(] $1[)] : $2 ;; T19,29 -m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:607 +m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:613 T9,156 m4_escapem4_if(m4_index(m4_translit([$1], [[]#,()][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789], [$$$]), [$]), @@ -2938,17 +2938,17 @@ _ASEOF test $as_write_fail = 0 && chmod +x $1[]dnl _m4_popdef([AS_MESSAGE_LOG_FD])[]_m4_defun_epi([$0]) T29,29 -m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:975 +m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:980 T12,24 m4_rename_m4m4_rename([$1], [m4_$1]) T30,29 -m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:657 +m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:663 T20,111 m4_stack_foreach_sep_m4_stack_reverse([$1], [m4_tmp-$1])_m4_stack_reverse([m4_tmp-$1], [$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]]) T20,30 -m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1026 +m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1028 T35,30 -m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1906 +m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1921 T19,156 _m4_defun_pro_outerm4_set_delete([_m4_provide])m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])m4_pushdef([_m4_divert_dump], m4_divnum)m4_divert_push([GROW]) T18,49 @@ -2978,11 +2978,11 @@ m4_stack_foreach_lifo_m4_stack_reverse([$1], [m4_tmp-$1], [$2(_m4_defn([m4_tmp-$ T11,33 m4_set_listm4_set_map_sep([$1], [], [], [,]) T32,29 -m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:156 +m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:157 T23,29 -m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:353 +m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:373 T29,30 -m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1384 +m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1391 F8,8 __line____line__ T9,793 @@ -3116,7 +3116,7 @@ m4_bpatsubstsm4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 3, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2], [$3]))], [_$0($@m4_if(m4_eval($# & 1), 0, [,]))]) T23,29 -m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:834 +m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:839 F7,4 m4_decrdecr T12,93 @@ -3130,11 +3130,11 @@ m4_set_emptym4_ifdef([_m4_set_size($1)], T15,36 m4_set_contentsm4_set_map_sep([$1], [], [], [[$2]]) T32,30 -m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1011 +m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1018 T15,55 _AS_TR_SH_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_sh` T20,29 -m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:550 +m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:553 T10,168 m4_combinem4_if([$2], [], [], m4_eval([$# > 3]), [1], [m4_map_args_sep([m4_map_args_sep(m4_dquote(], [)[[$3]], [], [[$1]],]]m4_dquote(m4_dquote(m4_shift3($@)))[[)], [[$1]], $2)]) @@ -3154,11 +3154,11 @@ T18,192 m4_cr_not_symbols2  !"#*%&'()$+,./:;<=>?@[\]^`{|}~- T23,30 -m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1002 +m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1006 F12,8 m4_bpatsubstpatsubst T31,29 -m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:451 +m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:504 T7,2 m4_echo$@ T20,1 @@ -3171,11 +3171,11 @@ T14,102 _AS_ME_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_BASENAME_PREPARE])as_me=`AS_BASENAME("$[0]")` []_m4_defun_epi([$0]) T26,30 -m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1339 +m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1356 T7,91 m4_argnm4_assert([0 < $1])m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@) T29,30 -m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1044 +m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1082 T8,27 m4_ifvalm4_if([$1], [], [$3], [$2]) T7,197 @@ -3274,17 +3274,17 @@ AS_ESCAPE_$0([$1], m4_if([$2], [], [[`], [\"$]], [m4_substr([$2], [0], [1]), [$2 T20,4 _m4_divert_diversionKILL T24,29 -m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:322 +m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:345 T22,30 -m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1034 +m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1036 T15,131 AT_CAPTURE_FILEm4_ifndef([AT_ingroup], [m4_fatal([AT_CAPTURE_FILE: missing AT_SETUP detected])])m4_append_uniq([AT_capture_files], ["$1"], [ \ ]) T30,30 -m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1805 +m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1809 T23,30 -m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1289 +m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1291 F12,8 _m4_undivertundivert T7,54 @@ -3299,8 +3299,8 @@ T16,56 _AS_TR_CPP_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_cpp` T17,28 m4_default_nblankm4_ifblank([$1], [$2], [$1]) -T28,29 -m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:982 +T28,30 +m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:1000 T18,540 _AS_TR_CPP_LITERALm4_translit([[$1]], [*[]][abcdefghijklmnopqrstuvwxyz @@ -3494,7 +3494,7 @@ _m4_expand_m4_if([$4], [}>=-], [m4_changequote([-=<{$2], [)}>=-])$3m4_changequote([, ])], [$0([$1], [($2], -=<{($2$1)}>=-, [}>=-])m4_ignore$2]) T29,29 -m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:926 +m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:940 T14,29 AT_COLOR_TESTSm4_define([AT_color], [auto]) T17,64 @@ -3561,7 +3561,7 @@ AS_SET_CATFILEcase $2 in @%:@(( esac;; esac[] T34,30 -m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1948 +m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1962 T13,26 m4_cr_lettersabcdefghijklmnopqrstuvwxyz T11,140 @@ -3631,7 +3631,7 @@ AS_DIRNAME_m4_defun_pro([$0])AS_REQUIRE([_$0_PREPARE])[]_m4_popdef([$0])m4_indir T23,3 _m4_divert(TEST_SCRIPT)450 T33,29 -m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:954 +m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:961 T13,42 m4_mapall_sepm4_if([$3], [], [], [_$0([$1], [$2], $3)]) T9,26 @@ -3759,7 +3759,7 @@ m4_applym4_if([$2], [], [$1], [$1($2)])[] T30,0 m4_include(m4sugar/version.m4) T26,30 -m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1939 +m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1941 T19,3 _m4_divert(VERSION)350 T14,73 @@ -3818,7 +3818,7 @@ AS_VAR_APPENDas_fn_append $1 $2[] T13,155 AS_VAR_APPEND_m4_defun_pro([$0])AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T29,30 -m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1108 +m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1115 T8,198 _m4_qlenm4_define([m4_qlen-$1], m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])], @@ -3831,7 +3831,7 @@ m4_reversem4_if([$#], [0], [], [$#], [1], [[$1]], T13,1 AS_MESSAGE_FD1 T40,30 -m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1697 +m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1757 T30,30 m4_location(AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1166 T10,294 diff --git a/externals/autotools/share/autoconf/m4sugar/m4sh.m4f b/externals/autotools/share/autoconf/m4sugar/m4sh.m4f index ec10f046705..8033a183565 100644 --- a/externals/autotools/share/autoconf/m4sugar/m4sh.m4f +++ b/externals/autotools/share/autoconf/m4sugar/m4sh.m4f @@ -1,4 +1,4 @@ -# This is a frozen state file generated by GNU M4 1.4.13 +# This is a frozen state file generated by GNU M4 1.4.6 V1 Q1,1 [] @@ -25,9 +25,9 @@ AS_MESSAGE_LOG_FD T8,0 _m4_warn T27,30 -m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1122 +m4_location(_AS_ME_PREPARE)../../lib/m4sugar/m4sh.m4:1125 T20,29 -m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:585 +m4_location(AS_EXIT)../../lib/m4sugar/m4sh.m4:586 T21,479 _AS_VAR_ARITH_PREPARE_m4_defun_pro([$0])AS_FUNCTION_DESCRIBE([as_fn_arith], [ARG...], [Perform arithmetic evaluation on the ARGs, and store the result in @@ -51,7 +51,7 @@ m4_map_args_sepm4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [4], [$1[$4]$2[]], [$1[$4]$2[]_m4_foreach([$3[]$1], [$2], m4_shift3($@))]) T22,30 -m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1090 +m4_location(AS_TEST_X)../../lib/m4sugar/m4sh.m4:1092 T8,150 m4_defunm4_define([m4_location($1)], m4_location)m4_default([$3], [m4_define])([$1], [_m4_defun_pro(]m4_dquote($[0])[)$2[]_m4_defun_epi(]m4_dquote($[0])[)]) @@ -112,7 +112,7 @@ _m4_dumpdefm4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_builtin([dumpdef], [$1])], [m4_map_args_sep([m4_builtin([dumpdef],], [)], [], $@)]) T25,30 -m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1981 +m4_location(AS_VAR_ARITH)../../lib/m4sugar/m4sh.m4:1984 T14,131 m4_set_add_allm4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1]) + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@)))) @@ -130,7 +130,7 @@ AS_VAR_TEST_SETAS_LITERAL_WORD_IF([$1], T7,111 AS_EXIT_m4_defun_pro([$0])AS_REQUIRE([_AS_EXIT_PREPARE])[]as_fn_exit m4_ifval([$1], [$1], [$][?])[]_m4_defun_epi([$0]) T27,30 -m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1793 +m4_location(_AS_CR_PREPARE)../../lib/m4sugar/m4sh.m4:1800 T13,175 m4_defun_initm4_define([$1], [$3[]])m4_defun([$1], [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl @@ -169,14 +169,14 @@ _m4_divert(GROW)10000 T18,72 m4_version_compare_m4_list_cmp_raw(_m4_version_unletter([$1]), _m4_version_unletter([$2])) T31,30 -m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1167 +m4_location(_AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1213 T25,1 _m4_divert(M4SH-SANITIZE)4 T10,120 _AS_ESCAPEm4_if(m4_index(m4_translit([[$1]], [$3], [$2$2$2$2]), [$2]), [-1], [$0_], [m4_bpatsubst])([$1], [[$2$3]], [\\\&]) T29,29 -m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:568 +m4_location(_AS_EXIT_PREPARE)../../lib/m4sugar/m4sh.m4:577 T15,165 _m4_set_add_allm4_if([$#], [2], [], [m4_ifdef([_m4_set([$1],$3)], [], @@ -221,7 +221,7 @@ _AS_IFelif $1; then : T13,15 AS_VAR_POPDEFm4_popdef([$1]) T23,29 -m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:385 +m4_location(AS_REQUIRE)../../lib/m4sugar/m4sh.m4:389 F6,3 m4_lenlen T14,42 @@ -234,7 +234,7 @@ AS_VAR_GETAS_LITERAL_WORD_IF([$1], [$$1], [`eval 'as_val=${'_AS_ESCAPE([[$1]], [`], [\])'};AS_ECHO(["$as_val"])'`]) T29,30 -m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1223 +m4_location(_AS_LN_S_PREPARE)../../lib/m4sugar/m4sh.m4:1250 F12,9 m4_debugmodedebugmode T10,280 @@ -252,7 +252,7 @@ m4_append_uniqm4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [], T15,0 _m4_divert_dump T27,30 -m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2066 +m4_location(AS_VAR_PUSHDEF)../../lib/m4sugar/m4sh.m4:2068 T20,20 m4_PACKAGE_BUGREPORTbug-autoconf@gnu.org T8,66 @@ -289,7 +289,7 @@ _m4_append_uniqm4_ifdef([$1], [m4_append([$1], [$2], [$3])$4], [$5])], [m4_define([$1], [$2])$4]) T32,30 -m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1296 +m4_location(_AS_MKDIR_P_PREPARE)../../lib/m4sugar/m4sh.m4:1309 T20,201 _AS_BASENAME_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_EXPR_PREPARE])if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename @@ -345,7 +345,7 @@ m4_popdefm4_if([$#], [0], [[$0]], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)]) T21,29 -m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:671 +m4_location(AS_UNSET)../../lib/m4sugar/m4sh.m4:672 T12,152 _m4_set_dumpm4_ifdef([_m4_set([$1])], [[$2]_m4_defn([_m4_set([$1])])_m4_popdef([_m4_set([$1],]_m4_defn( @@ -363,9 +363,9 @@ T12,32 m4_make_listm4_join([, ], m4_dquote_elt($@)) T31,29 -m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:807 +m4_location(_AS_ECHO_N_PREPARE)../../lib/m4sugar/m4sh.m4:820 T27,29 -m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:894 +m4_location(AS_LINENO_PUSH)../../lib/m4sugar/m4sh.m4:895 T11,498 _AS_MKDIR_Pcase $as_dir in #( -*) as_dir=./$as_dir;; @@ -385,7 +385,7 @@ _AS_MKDIR_Pcase $as_dir in #( } || test -d "$as_dir" || AS_ERROR([cannot create directory $as_dir]) T39,30 -m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1315 +m4_location(_AS_PATH_SEPARATOR_PREPARE)../../lib/m4sugar/m4sh.m4:1324 T5,73 m4_dom4_if([$#], 0, [], [$#], 1, [$1[]], @@ -393,7 +393,7 @@ m4_dom4_if([$#], 0, [], F9,6 m4_substrsubstr T33,29 -m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:167 +m4_location(_AS_DETECT_SUGGESTED)../../lib/m4sugar/m4sh.m4:168 T18,8 m4_PACKAGE_TARNAMEautoconf T13,252 @@ -405,7 +405,7 @@ m4_set_removem4_set_contains([$1], [$2], [_m4_set_size([$1], T19,109 _m4_defun_epi_outer_m4_popdef([_m4_divert_dump], [_m4_diverting([$1])], [_m4_diverting])m4_divert_pop([GROW])m4_undivert([GROW]) T27,30 -m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1878 +m4_location(_AS_TR_PREPARE)../../lib/m4sugar/m4sh.m4:1879 T15,58 m4_divert_stackm4_stack_foreach_sep_lifo([_m4_divert_stack], [], [], [ ]) @@ -416,9 +416,9 @@ AS_VAR_PUSHDEF_$0([$1], m4_expand([$2]))[] T14,130 AS_VAR_PUSHDEF_m4_defun_pro([$0])AS_REQUIRE([_AS_TR_SH_PREPARE])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T18,29 -m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:639 +m4_location(AS_IF)../../lib/m4sugar/m4sh.m4:643 T31,30 -m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1767 +m4_location(AS_VERSION_COMPARE)../../lib/m4sugar/m4sh.m4:1775 F9,6 m4_syscmdsyscmd T11,136 @@ -454,7 +454,7 @@ _m4_list_cmp_rawm4_if([$1], [$2], [0], [_m4_list_cmp_1([$1], $2)]) T8,0 __unix__ T20,30 -m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1257 +m4_location(AS_LN_S)../../lib/m4sugar/m4sh.m4:1259 T14,109 m4_file_appendm4_syscmd([cat >>$1 <<_m4eof $2 @@ -470,7 +470,7 @@ m4_pushdef([$1], [$as_[$1]])], T15,49 m4_rename_forcem4_ifdef([$2], [_m4_undefine([$2])])m4_rename($@) T28,30 -m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1098 +m4_location(AS_EXECUTABLE_P)../../lib/m4sugar/m4sh.m4:1100 T9,222 m4_bmatchm4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], @@ -500,7 +500,7 @@ _AS_DETECT_REQUIRED_m4_defun_pro([$0])m4_set_add([_AS_DETECT_REQUIRED_BODY], [$1 T10,121 m4_re_word[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]* T26,29 -m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:649 +m4_location(AS_SET_STATUS)../../lib/m4sugar/m4sh.m4:650 T14,37 m4_PACKAGE_URLhttp://www.gnu.org/software/autoconf/ T11,62 @@ -671,8 +671,8 @@ _m4_stack_reversem4_ifdef([$1], [m4_pushdef([$2], T16,103 AS_IDENTIFIER_IFm4_if(_$0(m4_if(m4_index([$1], [@]), [-1], [[$1]], [m4_bpatsubst([[$1]], [@&t@])])), [-], [$2], [$3]) -F11,7 -m4_maketempmkstemp +F11,8 +m4_maketempmaketemp T17,129 _AS_DETECT_EXPAND$1="m4_bpatsubst(m4_dquote(AS_ESCAPE(_m4_expand(m4_set_contents([$2], [ ])))), [\\\$LINENO\(.*\)$], [";$1=$$1$LINENO;$1=$$1"\1])" @@ -682,7 +682,7 @@ m4_nm4_if([$1], [$1 ]) T26,29 -m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:904 +m4_location(AS_LINENO_POP)../../lib/m4sugar/m4sh.m4:905 T8,22 AS_TR_SH_$0(m4_expand([$1]))[] T8,124 @@ -700,7 +700,7 @@ m4_ignore T9,28 _m4_quotem4_if([$#], [0], [], [[$*]]) T21,30 -m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1826 +m4_location(AS_TR_SH)../../lib/m4sugar/m4sh.m4:1828 T9,35 m4_shiftnm4_assert(0 < $1 && $1 < $#)_$0($@) T7,75 @@ -714,7 +714,7 @@ m4_set_listcm4_set_map_sep([$1], [,]) F9,6 m4_divnumdivnum T30,30 -m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2121 +m4_location(AS_INIT_GENERATED)../../lib/m4sugar/m4sh.m4:2140 T21,76 _m4_set_add_all_checkm4_if([$#], [2], [], [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))]) @@ -753,8 +753,8 @@ _AS_LITERAL_IF_m4_if(m4_translit([$1], [+]), [], [$0YES], m4_translit([$1], [$]), [], [m4_default], [$0NO]) F9,6 m4_formatformat -F10,7 -m4_mkstempmkstemp +F10,8 +m4_mkstempmaketemp F11,11 __program____program__ T6,26 @@ -880,7 +880,7 @@ m4_indirindir T12,1 _m4_divert()0 T31,30 -m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1845 +m4_location(_AS_TR_CPP_PREPARE)../../lib/m4sugar/m4sh.m4:1849 F12,9 m4_changecomchangecom T20,40 @@ -949,9 +949,9 @@ m4_divert_pop[][]_m4_defun_epi([$0]) T11,17 m4_location__file__:__line__ T24,29 -m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:942 +m4_location(AS_BASENAME)../../lib/m4sugar/m4sh.m4:946 T36,29 -m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:194 +m4_location(_AS_DETECT_BETTER_SHELL)../../lib/m4sugar/m4sh.m4:273 T11,54 m4_ifnblankm4_if(m4_translit([[$1]], [ ][ ][ ]), [], [$3], [$2]) @@ -980,7 +980,7 @@ m4_form4_pushdef([$1], m4_eval([$2]))m4_cond([m4_eval(([$3]) > ([$2]))], 1, T8,42 _AS_ECHO_AS_ECHO_UNQUOTED([_AS_QUOTE([$1])], [$2]) T25,29 -m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:790 +m4_location(_AS_ECHO_LOG)../../lib/m4sugar/m4sh.m4:792 T17,185 _AS_TR_SH_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_CR_PREPARE])# Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[[^_$as_cr_alnum]]%_%g'" @@ -1021,7 +1021,7 @@ _AS_CASE_DEFAULT [@%:@(] T7,30 AS_WARNAS_MESSAGE([WARNING: $1], [2]) T30,29 -m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:921 +m4_location(_AS_BASENAME_EXPR)../../lib/m4sugar/m4sh.m4:924 T17,490 _AS_TR_SH_LITERALm4_translit([[$1]], [*+[]][ @@ -1093,7 +1093,7 @@ m4_set_deletem4_ifdef([_m4_set([$1])], [_m4_set_size($1)], [_m4_popdef([_m4_set_size($1)])])]) T34,29 -m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:279 +m4_location(_AS_REEXEC_WITH_SHELL)../../lib/m4sugar/m4sh.m4:297 T12,10 m4_cr_digits0123456789 T17,17 @@ -1146,7 +1146,7 @@ m4_wrap([m4_popdef([_m4_divert_diversion])m4_ifdef( ]m4_divert_stack)])_m4_popdef([_m4_divert_stack])m4_divert_push([KILL])]) T21,29 -m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:883 +m4_location(AS_ERROR)../../lib/m4sugar/m4sh.m4:887 T11,162 m4_dumpdefsm4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_stack_foreach_lifo([$1], [m4_dumpdef([$1])m4_ignore])], @@ -1168,13 +1168,13 @@ m4_n([$2])$1 () $3 } @%:@ $1[] T22,30 -m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1859 +m4_location(AS_TR_CPP)../../lib/m4sugar/m4sh.m4:1861 T8,28 _AS_CASE [@%:@(] $1[)] : $2 ;; T19,29 -m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:607 +m4_location(AS_FOR)../../lib/m4sugar/m4sh.m4:613 T9,156 m4_escapem4_if(m4_index(m4_translit([$1], [[]#,()][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789], [$$$]), [$]), @@ -1197,17 +1197,17 @@ _ASEOF test $as_write_fail = 0 && chmod +x $1[]dnl _m4_popdef([AS_MESSAGE_LOG_FD])[]_m4_defun_epi([$0]) T29,29 -m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:975 +m4_location(_AS_DIRNAME_EXPR)../../lib/m4sugar/m4sh.m4:980 T12,24 m4_rename_m4m4_rename([$1], [m4_$1]) T30,29 -m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:657 +m4_location(_AS_UNSET_PREPARE)../../lib/m4sugar/m4sh.m4:663 T20,111 m4_stack_foreach_sep_m4_stack_reverse([$1], [m4_tmp-$1])_m4_stack_reverse([m4_tmp-$1], [$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]]) T20,30 -m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1026 +m4_location(AS_ECHO)../../lib/m4sugar/m4sh.m4:1028 T35,30 -m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1906 +m4_location(_AS_VAR_APPEND_PREPARE)../../lib/m4sugar/m4sh.m4:1921 T19,156 _m4_defun_pro_outerm4_set_delete([_m4_provide])m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])m4_pushdef([_m4_divert_dump], m4_divnum)m4_divert_push([GROW]) T18,49 @@ -1237,11 +1237,11 @@ m4_stack_foreach_lifo_m4_stack_reverse([$1], [m4_tmp-$1], [$2(_m4_defn([m4_tmp-$ T11,33 m4_set_listm4_set_map_sep([$1], [], [], [,]) T32,29 -m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:156 +m4_location(_AS_DETECT_REQUIRED)../../lib/m4sugar/m4sh.m4:157 T23,29 -m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:353 +m4_location(AS_PREPARE)../../lib/m4sugar/m4sh.m4:373 T29,30 -m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1384 +m4_location(_AS_TEST_PREPARE)../../lib/m4sugar/m4sh.m4:1391 F8,8 __line____line__ T13,41 @@ -1342,7 +1342,7 @@ m4_bpatsubstsm4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 3, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2], [$3]))], [_$0($@m4_if(m4_eval($# & 1), 0, [,]))]) T23,29 -m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:834 +m4_location(AS_MESSAGE)../../lib/m4sugar/m4sh.m4:839 F7,4 m4_decrdecr T12,93 @@ -1354,11 +1354,11 @@ m4_set_emptym4_ifdef([_m4_set_size($1)], T15,36 m4_set_contentsm4_set_map_sep([$1], [], [], [[$2]]) T32,30 -m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1011 +m4_location(_AS_DIRNAME_PREPARE)../../lib/m4sugar/m4sh.m4:1018 T15,55 _AS_TR_SH_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_sh` T20,29 -m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:550 +m4_location(AS_CASE)../../lib/m4sugar/m4sh.m4:553 T10,168 m4_combinem4_if([$2], [], [], m4_eval([$# > 3]), [1], [m4_map_args_sep([m4_map_args_sep(m4_dquote(], [)[[$3]], [], [[$1]],]]m4_dquote(m4_dquote(m4_shift3($@)))[[)], [[$1]], $2)]) @@ -1378,11 +1378,11 @@ T18,192 m4_cr_not_symbols2  !"#*%&'()$+,./:;<=>?@[\]^`{|}~- T23,30 -m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1002 +m4_location(AS_DIRNAME)../../lib/m4sugar/m4sh.m4:1006 F12,8 m4_bpatsubstpatsubst T31,29 -m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:451 +m4_location(_AS_SHELL_SANITIZE)../../lib/m4sugar/m4sh.m4:504 T7,2 m4_echo$@ T20,1 @@ -1393,11 +1393,11 @@ T14,102 _AS_ME_PREPARE_m4_defun_pro([$0])AS_REQUIRE([_AS_BASENAME_PREPARE])as_me=`AS_BASENAME("$[0]")` []_m4_defun_epi([$0]) T26,30 -m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1339 +m4_location(_AS_PATH_WALK)../../lib/m4sugar/m4sh.m4:1356 T7,91 m4_argnm4_assert([0 < $1])m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@) T29,30 -m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1044 +m4_location(_AS_ECHO_PREPARE)../../lib/m4sugar/m4sh.m4:1082 T8,27 m4_ifvalm4_if([$1], [], [$3], [$2]) T7,197 @@ -1496,13 +1496,13 @@ AS_ESCAPE_$0([$1], m4_if([$2], [], [[`], [\"$]], [m4_substr([$2], [0], [1]), [$2 T20,4 _m4_divert_diversionKILL T24,29 -m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:322 +m4_location(_AS_PREPARE)../../lib/m4sugar/m4sh.m4:345 T22,30 -m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1034 +m4_location(AS_ECHO_N)../../lib/m4sugar/m4sh.m4:1036 T30,30 -m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1805 +m4_location(_AS_TR_SH_PREPARE)../../lib/m4sugar/m4sh.m4:1809 T23,30 -m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1289 +m4_location(AS_MKDIR_P)../../lib/m4sugar/m4sh.m4:1291 F12,8 _m4_undivertundivert T7,54 @@ -1517,8 +1517,8 @@ T16,56 _AS_TR_CPP_INDIR`AS_ECHO(["_AS_ESCAPE([[$1]], [`], [\])"]) | $as_tr_cpp` T17,28 m4_default_nblankm4_ifblank([$1], [$2], [$1]) -T28,29 -m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:982 +T28,30 +m4_location(_AS_DIRNAME_SED)../../lib/m4sugar/m4sh.m4:1000 T18,540 _AS_TR_CPP_LITERALm4_translit([[$1]], [*[]][abcdefghijklmnopqrstuvwxyz @@ -1698,7 +1698,7 @@ _m4_expand_m4_if([$4], [}>=-], [m4_changequote([-=<{$2], [)}>=-])$3m4_changequote([, ])], [$0([$1], [($2], -=<{($2$1)}>=-, [}>=-])m4_ignore$2]) T29,29 -m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:926 +m4_location(_AS_BASENAME_SED)../../lib/m4sugar/m4sh.m4:940 T17,64 _m4_divert_unsafem4_fatal([$0: cannot change diversion to `$1' inside m4_expand]) T8,99 @@ -1761,7 +1761,7 @@ AS_SET_CATFILEcase $2 in @%:@(( esac;; esac[] T34,30 -m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1948 +m4_location(_AS_VAR_ARITH_PREPARE)../../lib/m4sugar/m4sh.m4:1962 T13,26 m4_cr_lettersabcdefghijklmnopqrstuvwxyz T7,13 @@ -1823,7 +1823,7 @@ _AS_DIRNAME_SED([$1])[] T10,124 AS_DIRNAME_m4_defun_pro([$0])AS_REQUIRE([_$0_PREPARE])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T33,29 -m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:954 +m4_location(_AS_BASENAME_PREPARE)../../lib/m4sugar/m4sh.m4:961 T13,42 m4_mapall_sepm4_if([$3], [], [], [_$0([$1], [$2], $3)]) T9,26 @@ -1944,7 +1944,7 @@ m4_applym4_if([$2], [], [$1], [$1($2)])[] T30,0 m4_include(m4sugar/version.m4) T26,30 -m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1939 +m4_location(AS_VAR_APPEND)../../lib/m4sugar/m4sh.m4:1941 T14,73 _m4_mapall_sepm4_apply([$1], [$3])_m4_foreach([m4_apply([$2[]$1],], [)], m4_shift2($@)) T9,132 @@ -1986,7 +1986,7 @@ AS_VAR_APPENDas_fn_append $1 $2[] T13,155 AS_VAR_APPEND_m4_defun_pro([$0])AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN])[]_m4_popdef([$0])m4_indir([$0]m4_if([$#], [0], [], [,$@]))[]_m4_defun_epi([$0]) T29,30 -m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1108 +m4_location(_AS_EXPR_PREPARE)../../lib/m4sugar/m4sh.m4:1115 T8,198 _m4_qlenm4_define([m4_qlen-$1], m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])], @@ -1999,7 +1999,7 @@ m4_reversem4_if([$#], [0], [], [$#], [1], [[$1]], T13,1 AS_MESSAGE_FD1 T40,30 -m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1697 +m4_location(_AS_VERSION_COMPARE_PREPARE)../../lib/m4sugar/m4sh.m4:1757 T30,30 m4_location(AS_LINENO_PREPARE)../../lib/m4sugar/m4sh.m4:1166 T10,294 diff --git a/externals/autotools/share/autoconf/m4sugar/m4sugar.m4f b/externals/autotools/share/autoconf/m4sugar/m4sugar.m4f index d1db3f4ba8a..2d81e697bd3 100644 --- a/externals/autotools/share/autoconf/m4sugar/m4sugar.m4f +++ b/externals/autotools/share/autoconf/m4sugar/m4sugar.m4f @@ -1,4 +1,4 @@ -# This is a frozen state file generated by GNU M4 1.4.13 +# This is a frozen state file generated by GNU M4 1.4.6 V1 Q1,1 [] @@ -305,8 +305,8 @@ m4_cr_LETTERSABCDEFGHIJKLMNOPQRSTUVWXYZ T17,94 _m4_stack_reversem4_ifdef([$1], [m4_pushdef([$2], _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4$3])]) -F11,7 -m4_maketempmkstemp +F11,8 +m4_maketempmaketemp T4,37 m4_nm4_if([$1], [], [], @@ -353,8 +353,8 @@ _m4_text_wrapm4_pushdef([m4_Indent], m4_qlen([$2]))m4_pushdef([m4_Cursor], m4_ql m4_eval(m4_Indent - m4_Cursor)), [])m4_define([m4_Cursor], m4_Indent)])m4_map_args_w([$1], [$0_word(], [, [$2], [$4])])_m4_popdef([m4_Separator], [m4_Cursor], [m4_Indent]) F9,6 m4_formatformat -F10,7 -m4_mkstempmkstemp +F10,8 +m4_mkstempmaketemp F11,11 __program____program__ T7,156 diff --git a/externals/autotools/share/automake-1.12/Automake/Config.pm b/externals/autotools/share/automake-1.12/Automake/Config.pm index 3ebaa936639..55b57fca86c 100644 --- a/externals/autotools/share/automake-1.12/Automake/Config.pm +++ b/externals/autotools/share/automake-1.12/Automake/Config.pm @@ -32,7 +32,7 @@ our $PACKAGE = 'automake'; our $PACKAGE_BUGREPORT = 'bug-automake@gnu.org'; our $VERSION = '1.12.5'; our $RELEASE_YEAR = '2012'; -our $libdir = '/ADL/fpalacios/SU2/trunk/externals/autotools/share/automake-1.12'; +our $libdir = '/Users/fpalacios/SU2/trunk/externals/autotools/share/automake-1.12'; our $perl_threads = 1; 1; diff --git a/externals/autotools/share/emacs/site-lisp/autoconf-mode.elc b/externals/autotools/share/emacs/site-lisp/autoconf-mode.elc index 947ab3a316649bd8ba408de69a2d7cee2a06356d..979f8e2d3b48b966c8fe48738caa2d54e9d0e0ef 100644 GIT binary patch delta 179 zcmew%(JxtV?dsz!!oa}5Wo>P(;GCaZkeQR3qL5UnkXDeGlbD>DU+j>Ws0(B3<|G!B zTbY1 O&SWMgbBoF0Jcu$?dsz!&cMLHWo>P(;GCaZkeQR3qL5UnkXDeGlbD>DU+hqonV+WsL?NZA z3SOmo3Wf#>hQ?MVMpnj#3PuKoCSa{;Mftf3X+X^i`i?F>6N_D0%nU3|C+^i?G~W1Z o8RO&xCicxeO#Cd&rWR(K=doonGZ~m|=HyCdVlp+IoX4XG0DAZ+DgXcg diff --git a/externals/autotools/share/emacs/site-lisp/autotest-mode.elc b/externals/autotools/share/emacs/site-lisp/autotest-mode.elc index a15688ce83c1ec869e09227f8490a8b15d9e9673..3a0d278f96d1a467491baaf1cac95ca635194ca5 100644 GIT binary patch delta 179 zcmX>j`dGBy+SSKdgn@y9%i7vn!8t#-ATuX5MIotDA*~=WCowrQzt|x$Q5VM6%}FdM z$uH0=E=kNw%P&gNOHC}Cv^ce>SRZb*e(=O3OIAZ;Q%mEC^EDWaHlA3frUsK&b14DF1_PTZ@(XuR>+ zGRDaXOzfL`n3|cG4J{2e3$c1KGZ`9ej^#*ZQZ_QzRLINBiPhxNC@9J=%S=gCP){r^ R$uCJQF44`+Pf69}0syuAGDrXb diff --git a/externals/autotools/share/info/dir b/externals/autotools/share/info/dir index 73c759cfa09..e495396dfa0 100644 --- a/externals/autotools/share/info/dir +++ b/externals/autotools/share/info/dir @@ -15,25 +15,21 @@ File: dir, Node: Top This is the top of the INFO tree * Menu: Individual utilities -* aclocal-invocation: (automake)aclocal Invocation. - Generating aclocal.m4. +* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. * autoconf-invocation: (autoconf)autoconf Invocation. - How to create configuration - scripts -* autoheader: (autoconf)autoheader Invocation. How to create configuration - templates -* autom4te: (autoconf)autom4te Invocation. The Autoconf executables - backbone -* automake-invocation: (automake)automake Invocation. - Generating Makefile.in. -* autoreconf: (autoconf)autoreconf Invocation. Remaking multiple `configure' - scripts -* autoscan: (autoconf)autoscan Invocation. Semi-automatic `configure.ac' - writing -* autoupdate: (autoconf)autoupdate Invocation. Automatic update of - `configure.ac' -* config.status: (autoconf)config.status Invocation. - Recreating configurations. + How to create configuration scripts +* autoheader: (autoconf)autoheader Invocation. + How to create configuration templates +* autom4te: (autoconf)autom4te Invocation. + The Autoconf executables backbone +* automake-invocation: (automake)automake Invocation. Generating Makefile.in. +* autoreconf: (autoconf)autoreconf Invocation. + Remaking multiple `configure' scripts +* autoscan: (autoconf)autoscan Invocation. + Semi-automatic `configure.ac' writing +* autoupdate: (autoconf)autoupdate Invocation. + Automatic update of `configure.ac' +* config.status: (autoconf)config.status Invocation. Recreating configurations. * configure: (autoconf)configure Invocation. Configuring a package. * ifnames: (autoconf)ifnames Invocation. Listing conditionals in source. * libtool-invocation: (libtool)Invoking libtool.