Merge branch 'develop' into f/flaps

Ben-Mertz · Jan 30, 2020 · 427b85b · 427b85b
2 parents e096e0f + 9fd854e
commit 427b85b
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 458 deletions.
diff --git a/#Archive/CONSTSteps_MPS.wnd b/#Archive/CONSTSteps_MPS.wnd
diff --git a/#Archive/Debug/CompileRunAndDebug.cmd b/#Archive/Debug/CompileRunAndDebug.cmd
diff --git a/#Archive/Debug/CompileRunAndPause.cmd b/#Archive/Debug/CompileRunAndPause.cmd
diff --git a/#Archive/Debug/PlotDebugData.m b/#Archive/Debug/PlotDebugData.m
diff --git a/#Archive/Debug/saveFigs.m b/#Archive/Debug/saveFigs.m
diff --git a/#Archive/README.docx b/#Archive/README.docx
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,5 @@
-
 cmake_minimum_required(VERSION 3.6)
-project(DRC_Fortran VERSION 0.1 LANGUAGES Fortran)
+project(ROSCO VERSION 1.0.0 LANGUAGES Fortran)
 
 set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/ftnmods")
 

diff --git a/DISCON.sln b/DISCON.sln
diff --git a/DISCON.vfproj b/DISCON.vfproj