Add dummy controller for primary simulation

CMakeLists.txt

@@ -21,9 +21,12 @@ set(DECOMP_LIBRARY_PATH "${DECOMP_PATH}/lib")
 set(DECOMP_INCLUDE_PATH "${DECOMP_PATH}/include")
 
 # Where to look for Lib_VTK_IO
-set(VTK_IO_PATH $ENV{VTK_IO_PATH})
-set(VTK_IO_LIBRARY_PATH "${VTK_IO_PATH}/lib")
-set(VTK_IO_INCLUDE_PATH "${VTK_IO_PATH}/modules")
+# set(VTK_IO_PATH $ENV{VTK_IO_PATH})
+# set(VTK_IO_LIBRARY_PATH "${VTK_IO_PATH}/lib")
+# set(VTK_IO_INCLUDE_PATH "${VTK_IO_PATH}/modules")
+# set(VTK_IO_PATH $ENV{VTK_IO_PATH})
+# set(VTK_IO_LIBRARY_PATH "${VTK_IO_PATH}/lib")
+# set(VTK_IO_INCLUDE_PATH "${VTK_IO_PATH}/modules")
 
 # Where to look for HDF5
 set(HDF5_PATH $ENV{HDF5_PATH})
@@ -58,27 +61,29 @@ elseif ( CMAKE_Fortran_COMPILER_ID MATCHES "GNU_OSX")
     if ( CMAKE_BUILD_TYPE MATCHES "Release" )
         set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wconversion -Wextra -Waliasing -fopenmp -ffree-form -ffree-line-length-none -ffast-math -funroll-loops -fno-protect-parens -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans")
     elseif ( CMAKE_BUILD_TYPE MATCHES "Debug" )
-        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -llapack -ffree-form -ffree-line-length-none -fopenmp -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans")
+        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -ffree-form -ffree-line-length-none -fopenmp -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans")
     endif()
 
 # Standard GNU compilers
 elseif ( CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     if ( CMAKE_BUILD_TYPE MATCHES "Release" )
-	if ($ENV{ARCH_OPT_FLAG})
-	    set(OPTFLAG "-march=native")
-	else()
-	    set(OPTFLAG $ENV{ARCH_OPT_FLAG})
-	endif()
-        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wconversion -Wextra -Waliasing -ffree-form -ffree-line-length-none -ffast-math ${OPTFLAG} -funroll-loops -fno-protect-parens -fopenmp")
+        if ($ENV{ARCH_OPT_FLAG})
+            # set(OPTFLAG "-march=native")
+            set(OPTFLAG $ENV{ARCH_OPT_FLAG})
+        else()
+            set(OPTFLAG $ENV{ARCH_OPT_FLAG})
+        endif()
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wconversion -Wextra -Waliasing -ffree-form -ffree-line-length-none -ffast-math ${OPTFLAG} -funroll-loops -fno-protect-parens -fopenmp -fallow-argument-mismatch -finit-integer=0 -finit-real=zero")
     elseif ( CMAKE_BUILD_TYPE MATCHES "Debug" )
-        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -llapack -ffree-form -ffree-line-length-none -fcheck=all -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising")
+        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -ffree-form -ffree-line-length-none -fcheck=all -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising")
     endif()
 
  elseif ( CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
     if ( CMAKE_BUILD_TYPE MATCHES "Release" )
-        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wconversion -Wextra -Waliasing -ffree-form -ffree-line-length-none -ffast-math -march=native -funroll-loops -fno-protect-parens -fopenmp")
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -h omp -hlist=a")
+        # set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wconversion -Wextra -Waliasing -ffree-form -ffree-line-length-none -ffast-math -funroll-loops -fno-protect-parens -fopenmp -finit-integer=0 -finit-real=zero")
     elseif ( CMAKE_BUILD_TYPE MATCHES "Debug" )
-        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -llapack -ffree-form -ffree-line-length-none -fcheck=all -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising")
+        set(CMAKE_Fortran_FLAGS "-Og -g -fbacktrace -pg -ffree-form -ffree-line-length-none -fcheck=all -fbounds-check -ffpe-trap=zero,overflow -Wall -Wconversion -Wextra -Waliasing -Wsurprising")
     endif()
 
  elseif ( CMAKE_Fortran_COMPILER_ID MATCHES "IBM")

problems/incompressible/diurnal_concurrent.F90

@@ -50,7 +50,7 @@ program diurnal_concurrent
     call precursor%start_io(.true.)                                           
 
     if (primary%usefringe) then
-        call primary%fringe_x%associateFringeTargets(precursor%u, precursor%v, precursor%wC, precursor%T) 
+        call primary%fringe_x%associateFringeTargets(precursor%u, precursor%v, precursor%w, precursor%T) 
     end if 
 
     call budg_tavg%init(primary_inputfile, primary)   !<-- Budget class initialization 

problems/incompressible/gablsdyn_igrid.F90

@@ -0,0 +1,64 @@
+! Template for PadeOps
+
+#include "gablsdyn_igrid_files/initialize.F90"       
+#include "gablsdyn_igrid_files/temporalHook.F90"  
+
+program gabls_igrid
+    use mpi
+    use kind_parameters,  only: clen
+    use IncompressibleGrid, only: igrid
+    use temporalhook, only: doTemporalStuff, initialize_controller_location
+    use timer, only: tic, toc
+    use budgets_xy_avg_mod, only: budgets_xy_avg 
+    use budgets_time_avg_mod, only: budgets_time_avg  
+    use exits, only: message
+
+    implicit none
+
+    type(igrid), allocatable, target :: igp
+    character(len=clen) :: inputfile
+    integer :: ierr
+    type(budgets_xy_avg) :: budg_xy
+    type(budgets_time_avg) :: budg_tavg
+
+    call MPI_Init(ierr)               !<-- Begin MPI
+
+    call GETARG(1,inputfile)          !<-- Get the location of the input file
+
+    allocate(igp)                     !<-- Initialize hit_grid with defaults
+
+    call compute_xdim_udim(inputfile)
+    call igp%init(inputfile)          !<-- Properly initialize the hit_grid solver (see hit_grid.F90)
+
+    !call igp%start_io(.false.)                !<-- Start I/O by creating a header file (see io.F90)
+
+    call igp%printDivergence()
+
+    call initialize_controller_location(igp, inputfile)
+
+    ! call budg_xy%init(inputfile, igp)   !<-- Budget class initialization 
+    call budg_tavg%init(inputfile, igp) !<-- Budget class initialization 
+
+    call tic() 
+    do while (igp%tsim < igp%tstop) 
+
+       call igp%timeAdvance()     !<-- Time stepping scheme + Pressure Proj. (see igridWallM.F90)
+       call doTemporalStuff(igp)     !<-- Go to the temporal hook (see temporalHook.F90)
+
+       !call budg_xy%doBudgets()         !<--- perform budget related operations 
+       call budg_tavg%doBudgets()       !<--- perform budget related operations 
+    end do 
+
+    !call budg_xy%destroy()             !<-- release memory taken by the budget class 
+    call budg_tavg%destroy()             !<-- release memory taken by the budget class 
+
+    call igp%finalize_io()                  !<-- Close the header file (wrap up i/o)
+
+    call igp%destroy()                !<-- Destroy the IGRID derived type 
+
+
+    deallocate(igp)                   !<-- Deallocate all the memory associated with scalar defaults
+
+    call MPI_Finalize(ierr)           !<-- Terminate MPI 
+
+end program