Merge branch 'devel_branch'

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER_ID "GNU")
 # Set the name of the computer you are compiling on.
 # Supported computers: panoramix, njord, marcc, darwin-brew
 # Otherwise, default settings are used
-set(hostname "generic")
+set(hostname "default")
 
 #--Set global VERBOSE flag;
 set(VERBOSE false)
@@ -54,6 +54,9 @@ set(USE_HIT false)
 # streaks effects on averaging
 set(USE_STREAKS false)
 
+# What does this do?
+set(USE_DYN_TN false)
+
 ################################################################################
 #                         Set up build (do not change)
 ################################################################################
@@ -62,6 +65,7 @@ set(USE_STREAKS false)
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
     add_definitions(-DPPIFORT)
     set(compiler_name "ifort")
+    add_definitions(-DPPIFORT)
 #  GNU
 elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
     add_definitions(-DPPGFORTRAN)
@@ -114,7 +118,9 @@ elseif (${hostname} STREQUAL "marcc")
 elseif (${hostname} STREQUAL "njord")
     # nothing yet, but can add if needed
 #  all other systems
-elseif (${hostname} STREQUAL "generic")
+elseif (${hostname} STREQUAL "default")
+    include_directories($ENV{HOME}/codes/fftw3/include)
+    link_directories($ENV{HOME}/codes/fftw3/lib)
     # nothing yet, but can add if needed
     if (USE_CGNS)
         include_directories($ENV{HOME}/cgns/include/)
@@ -124,15 +130,16 @@ endif ()
 
 # List common sources
 set (Sources cfl_util.f90 clocks.f90 convec.f90 derivatives.f90 divstress_uv.f90
-     divstress_w.f90 dns_stress.f90 emul_complex.f90 fft.f90 finalize.f90 
-     forcing.f90 fringe_util.f90 functions.f90 grid.f90 ic.f90 ic_dns.f90 
+     divstress_w.f90 emul_complex.f90 fft.f90 finalize.f90 
+     forcing.f90 fringe_util.f90 functions.f90 grid.f90
      initial.f90 initialize.f90 input_util.f90 interpolag_Sdep.f90 
      interpolag_Ssim.f90 io.f90 lagrange_Sdep.f90 lagrange_Ssim.f90 main.f90 
-     messages.f90 open_file.f90 padd.f90 param.f90 param_output.f90 
+     messages.f90 open_file.f90 param.f90 param_output.f90 
      press_stag_array.f90 rmsdiv.f90 scaledep_dynamic.f90 
      sgs_param.f90 sgs_stag_util.f90 sim_param.f90 stat_defs.f90 
      std_dynamic.f90 string_util.f90 test_filtermodule.f90 tridag_array.f90 
-     types.f90 unpadd.f90 wallstress.f90 wallstress_dns.f90 init_random_seed.f90)
+     types.f90 wallstress.f90 init_random_seed.f90
+     iwmles.f90)
 
 if (USE_MPI)
     add_definitions(-DPPMPI)
@@ -168,7 +175,7 @@ endif (USE_LVLSET)
 
 if (USE_TURBINES)
     add_definitions(-DPPTURBINES)
-    set(Sources ${Sources} turbines.f90 turbines_base.f90 util.f90)
+    set(Sources ${Sources} turbines.f90)
     set(exec_name "${exec_name}-turbines")
 endif (USE_TURBINES)
 
@@ -226,7 +233,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
     set (CMAKE_Fortran_FLAGS "-cpp -O2 -funroll-loops -no-wrap-margin -assume byterecl")
 # GNU
 else (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
-    set (CMAKE_Fortran_FLAGS "-cpp -O2 -ffast-math -funroll-loops -fall-intrinsics")
+    set (CMAKE_Fortran_FLAGS "-cpp -O2 -ffast-math -funroll-loops -fall-intrinsics -Wall")
 endif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
 
 # main lesgo executable

DEVELOPMENT

@@ -1,9 +1,21 @@
-Copyright (C) 2009-2016  Johns Hopkins University
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without any warranty.
+!!
+!!  Copyright (C) 2009-2016  Johns Hopkins University
+!!
+!!  This file is part of lesgo.
+!!
+!!  lesgo is free software: you can redistribute it and/or modify
+!!  it under the terms of the GNU General Public License as published by
+!!  the Free Software Foundation, either version 3 of the License, or
+!!  (at your option) any later version.
+!!
+!!  lesgo 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 General Public License for more details.
+!!
+!!  You should have received a copy of the GNU General Public License
+!!  along with lesgo.  If not, see <http://www.gnu.org/licenses/>.
+!!
 
 ================================================================================
                    TO DO LIST
@@ -24,7 +36,7 @@ ITEMS:
      CS - should work on njord, panoramix, and marcc. Ready for testing.
      JB - successfully tested on njord.
 
-(II) Remove deprecated preprocessor flags DEBUG, VERBOSE, DBLPREC
+(CC) Remove deprecated preprocessor flags DEBUG, VERBOSE, DBLPREC
      Assigned to everyone
      TM - removed DEBUG
      CS - removed DBLPREC and DEVEL(never used anyway)
@@ -39,18 +51,20 @@ ITEMS:
 (CC) Remove FFTW2 support
      Assigned to JB
 
-(CC) Fix some IO problems caused by removing Tecryte support
+(II) Fix some IO problems caused by removing Tecryte support
      Assigned to TM
      Added points writing capabilities.
      Velocity as a function of time is done by having a single file
      per point called point{number}.dat
+     This still needs to be completed for the binary output
 
 (NN) Interpolation from restart files to allow changes in domain size,
      grid size, and domain decomposition for parallelization. 
      Assigned to JB
 
 (CC) Include matlab functions for reading binary output files. 
      Assigned to JB
+     After changes to output files for consistency.
 
 (II) Related to task above (matlab functions for reading binary output files),
       add a 'post_processing' folder which includes basic utilities for reading
@@ -81,14 +95,15 @@ ITEMS:
       simulation to blow up.
       Assigned to no one.
 
-(CC) Fix compilation issues with level set. Tecryte will have to be disabled and replaced
-     by native fortran output. Assigned to CS.
+(CC) Fix compilation issues with level set. Tecryte will have to be disabled and
+     replaced by native fortran output. Assigned to CS.
 
-(II) Cleanup README:
+(CC) Cleanup README:
       CS - cleaned up removed features
-       - fix description of point IO
+      CS - fixed description of point IO
 
-(NN) Cleanup little/big endian read and write. These are inconsistently used in the code.
+(CC) Cleanup little/big endian read and write. These are inconsistently used in 
+     the code.
 
 ================================================================================
                    DEVELOPER NOTES
@@ -122,6 +137,7 @@ ITEMS:
 ================================================================================
 1. Subgrid models 2, 3, and 4 appear to be broken at the moment
 2. The spectra calculations are broken (jb)
+3. The sgs histograms are disabled (This uses tecplot anyway) (cs)
 
 ================================================================================
                    REMOVED FEATURES