Fixed single precision output without any consultation with Henry Le Berre

Author: wilfonba

CMakeLists.txt

@@ -71,9 +71,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake")
 # === Compiler Flags
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
     add_compile_options(
-        $<$<COMPILE_LANGUAGE:Fortran>:-fdefault-real-8>
         $<$<COMPILE_LANGUAGE:Fortran>:-ffree-line-length-none>
-        $<$<COMPILE_LANGUAGE:Fortran>:-fdefault-double-8>
     )
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")

src/post_process/m_checker.f90

@@ -246,14 +246,6 @@ subroutine s_check_inputs()
         elseif (precision /= 1 .and. precision /= 2) then
             call s_mpi_abort('Unsupported choice for the value of '// &
                 'precision. Exiting ...')
-
-            ! Constraints on the option to coarsen the formatted database files
-        elseif (coarsen_silo .and. format /= 1) then
-            call s_mpi_abort('Unsupported combination of values of format '// &
-                'and coarsen_silo. Exiting ...')
-        elseif (coarsen_silo .and. n == 0) then
-            call s_mpi_abort('Unsupported combination of values of n '// &
-                'and coarsen_silo. Exiting ...')
         end if
 
         ! Constraints on the post-processing of the partial densities

src/post_process/m_data_output.f90 renamed to src/post_process/m_data_output.fpp

@@ -50,7 +50,7 @@ module m_global_parameters
     !> @name Cell-boundary locations in the x-, y- and z-coordinate directions
     !> @{
     real(kind(0d0)), allocatable, dimension(:) :: x_cb, x_root_cb, y_cb, z_cb
-    real(kind(0d0)), allocatable, dimension(:) :: coarse_x_cb, coarse_y_cb, coarse_z_cb
+    real(kind(0.0)), allocatable, dimension(:) :: x_cb_s, y_cb_s, z_cb_s
     !> @}
 
     !> @name Cell-center locations in the x-, y- and z-coordinate directions
@@ -146,8 +146,6 @@ module m_global_parameters
 
     integer :: format !< Format of the database file(s)
 
-    logical :: coarsen_silo
-
     integer :: precision !< Floating point precision of the database file(s)
 
     !> @name Size of the ghost zone layer in the x-, y- and z-coordinate directions.
@@ -285,8 +283,6 @@ subroutine s_assign_default_values_to_user_inputs() ! ------------------
 
         precision = dflt_int
 
-        coarsen_silo = .false.
-
         alpha_rho_wrt = .false.
         rho_wrt = .false.
         mom_wrt = .false.
@@ -572,6 +568,17 @@ subroutine s_initialize_global_parameters_module() ! ----------------------
             buff_size = buff_size + fd_number
         end if
 
+        ! Allocating single precision grid variables if needed
+        if (precision == 1) then
+            allocate (x_cb_s(-1 - offset_x%beg:m + offset_x%end))
+            if (n > 0) then 
+                allocate (y_cb_s(-1 - offset_x%beg:n + offset_x%end))
+                if (p > 0) then
+                    allocate (z_cb_s(-1 - offset_x%beg:m + offset_x%end)) 
+                end if
+            end if
+        end if
+
         ! Allocating the grid variables in the x-coordinate direction
         allocate (x_cb(-1 - offset_x%beg:m + offset_x%end))
         allocate (x_cc(-buff_size:m + buff_size))
@@ -599,14 +606,6 @@ subroutine s_initialize_global_parameters_module() ! ----------------------
 
         end if
 
-        if (coarsen_silo) then
-            allocate (coarse_x_cb(-1 - offset_x%beg:(m/2) + offset_x%end))
-            if (n > 0) then
-                allocate (coarse_y_cb(-1 - offset_y%beg:(n/2) + offset_y%end))
-                if (p > 0) allocate (coarse_z_cb(-1 - offset_z%beg:(p/2) + offset_z%end))
-            end if
-        end if
-
         allocate (adv(num_fluids))
 
         if (cyl_coord .neqv. .true.) then ! Cartesian grid
@@ -812,14 +811,6 @@ subroutine s_finalize_global_parameters_module() ! -------------------
 
         end if
 
-        if (coarsen_silo) then
-            deallocate (coarse_x_cb)
-            if (n > 0) then
-                deallocate (coarse_y_cb)
-                if (p > 0) deallocate (coarse_z_cb)
-            end if
-        end if
-
         deallocate (proc_coords)
 
         deallocate (adv)

src/post_process/m_global_parameters.f90

@@ -163,10 +163,9 @@ contains
 
         #:for VAR in [ 'cyl_coord', 'adv_alphan', 'mpp_lim', 'mixture_err',    &
             & 'alt_soundspeed', 'hypoelasticity', 'parallel_io', 'rho_wrt',    &
-            & 'coarsen_silo', 'E_wrt', 'pres_wrt', 'gamma_wrt',                & 
+            & 'E_wrt', 'pres_wrt', 'gamma_wrt', 'polytropic', 'polydisperse',  & 
             & 'heat_ratio_wrt', 'pi_inf_wrt', 'pres_inf_wrt', 'cons_vars_wrt', & 
-            & 'prim_vars_wrt', 'c_wrt', 'qm_wrt','schlieren_wrt', 'bubbles',   &
-            & 'polytropic', 'polydisperse' ]
+            & 'prim_vars_wrt', 'c_wrt', 'qm_wrt','schlieren_wrt', 'bubbles']
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 

src/post_process/m_mpi_proxy.fpp

@@ -53,8 +53,7 @@ subroutine s_read_input_file() ! ---------------------------------------
             omega_wrt, qm_wrt, schlieren_wrt, schlieren_alpha, &
             fd_order, mixture_err, alt_soundspeed, &
             flux_lim, flux_wrt, cyl_coord, &
-            parallel_io, coarsen_silo, &
-            rhoref, pref, bubbles, R0ref, nb, &
+            parallel_io, rhoref, pref, bubbles, R0ref, nb, &
             polytropic, thermal, Ca, Web, Re_inv, &
             polydisperse, poly_sigma
 

src/post_process/m_start_up.f90

@@ -110,12 +110,12 @@
 
 POST_PROCESS = COMMON + [
     't_step_start', 't_step_stop', 't_step_save', 'alt_soundspeed',
-    'mixture_err', 'format', 'coarsen_silo',
+    'mixture_err', 'format', 'schlieren_wrt', 'schlieren_alpha', 'fd_order',
     'fourier_modes%beg', 'fourier_modes%end', 'alpha_rho_wrt', 'rho_wrt',
     'mom_wrt', 'vel_wrt', 'flux_lim', 'flux_wrt', 'E_wrt', 'pres_wrt',
     'alpha_wrt', 'kappa_wrt', 'gamma_wrt', 'heat_ratio_wrt', 'pi_inf_wrt',
     'pres_inf_wrt', 'cons_vars_wrt', 'prim_vars_wrt', 'c_wrt', 'omega_wrt',
-    'qm_wrt', 'schlieren_wrt', 'schlieren_alpha', 'fd_order'
+    'qm_wrt'
 ]
 
 for cmp_id in range(1,3+1):