split out Ekman tests into custom, ideal, input_sounding (#567)

Author: asalmgren

Exec/CMakeLists.txt

@@ -9,7 +9,7 @@ add_subdirectory(ABL)
 add_subdirectory(ChannelFlow)
 add_subdirectory(CouetteFlow)
 add_subdirectory(PoiseuilleFlow)
-add_subdirectory(EkmanSpiral)
+add_subdirectory(EkmanSpiral_custom)
 add_subdirectory(DensityCurrent)
 add_subdirectory(DensityCurrent_Terrain)
 add_subdirectory(WitchOfAgnesi)

Exec/EkmanSpiral/init_ideal_terrain.cpp

@@ -5,7 +5,6 @@ target_sources(${erf_exe_name}
    PRIVATE
      prob.H
      prob.cpp
-     init_ideal_terrain.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Exec/EkmanSpiral/CMakeLists.txt Exec/EkmanSpiral_custom/CMakeLists.txt

@@ -29,5 +29,5 @@ BL_NO_FORT = TRUE
 Bpack := ./Make.package
 Blocs := .
 ERF_HOME := ../..
-ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/EkmanSpiral
+ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/EkmanSpiral_custom
 include $(ERF_HOME)/Exec/Make.ERF

Exec/EkmanSpiral/GNUmakefile Exec/EkmanSpiral_custom/GNUmakefile

@@ -0,0 +1,2 @@
+CEXE_headers += prob.H
+CEXE_sources += prob.cpp

Exec/EkmanSpiral_custom/Make.package

@@ -0,0 +1,13 @@
+set(erf_exe_name ekman_spiral_ideal)
+
+add_executable(${erf_exe_name} "")
+target_sources(${erf_exe_name}
+   PRIVATE
+     prob.H
+     prob.cpp
+)
+
+target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+include(${CMAKE_SOURCE_DIR}/CMake/BuildERFExe.cmake)
+build_erf_exe(${erf_exe_name})

Exec/EkmanSpiral/README Exec/EkmanSpiral_custom/README

@@ -0,0 +1,36 @@
+# AMReX
+COMP = gnu
+PRECISION = DOUBLE
+
+TEST = TRUE
+USE_ASSERTION = TRUE
+
+# Profiling
+PROFILE = FALSE
+TINY_PROFILE = FALSE
+COMM_PROFILE = FALSE
+TRACE_PROFILE = FALSE
+MEM_PROFILE = FALSE
+USE_GPROF = FALSE
+
+# Performance
+USE_MPI = TRUE
+USE_OMP = FALSE
+USE_CUDA = FALSE
+USE_HIP = FALSE
+USE_DPCPP = FALSE
+
+# Debugging
+DEBUG = FALSE
+
+USE_NETCDF  = TRUE
+USE_TERRAIN = FALSE
+
+BL_NO_FORT = TRUE
+
+# GNU Make
+Bpack := ./Make.package
+Blocs := .
+ERF_HOME := ../..
+ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/EkmanSpiral_ideal
+include $(ERF_HOME)/Exec/Make.ERF

Exec/EkmanSpiral/check_convergence.py Exec/EkmanSpiral_custom/check_convergence.py

@@ -0,0 +1,2 @@
+CEXE_headers += prob.H
+CEXE_sources += prob.cpp

Exec/EkmanSpiral/inputs_ex Exec/EkmanSpiral_custom/inputs_ex

@@ -1,5 +1,5 @@
 # ------------------  INPUTS TO MAIN PROGRAM  -------------------
-max_step = 0
+max_step = 1
 stop_time = 1000.0
 
 amrex.fpe_trap_invalid = 1
@@ -16,6 +16,10 @@ zlo.type = "NoSlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
+integration.type    = RungeKutta
+integration.rk.type = 3
+erf.use_native_mri  = 0
+
 erf.fixed_dt       = 0.5     # fixed time step
 
 # DIAGNOSTICS & VERBOSITY
@@ -58,6 +62,4 @@ prob.T_0 = 300.0
 
 # INITIALIZATION WITH ATM DATA
 erf.init_type = "ideal"
-erf.nc_init_file_0 = "wrfinput_d01"
-
-FILE = ./inputs.time_integration
+erf.nc_init_file_0 = "wrfinput_ekman_d01"

Exec/EkmanSpiral/prob.H Exec/EkmanSpiral_custom/prob.H

@@ -0,0 +1,14 @@
+#ifndef _PROB_H_
+#define _PROB_H_
+
+#include <AMReX_REAL.H>
+
+struct ProbParm {
+  amrex::Real rho_0 = 1.0;
+  amrex::Real Theta_0 = 300.0;
+  amrex::Real V_0 = 1.0;
+}; // namespace ProbParm
+
+extern ProbParm parms;
+
+#endif

Exec/EkmanSpiral/prob.cpp Exec/EkmanSpiral_custom/prob.cpp

@@ -0,0 +1,82 @@
+#include "prob.H"
+#include "prob_common.H"
+
+#include "IndexDefines.H"
+#include "ERF_Constants.H"
+#include "AMReX_ParmParse.H"
+#include "AMReX_MultiFab.H"
+
+ProbParm parms;
+
+#ifdef ERF_USE_TERRAIN
+void
+erf_init_dens_hse(amrex::MultiFab& rho_hse,
+                  const amrex::MultiFab& z_phys_nd,
+                  const amrex::MultiFab& z_phys_cc,
+                  amrex::Geometry const& geom)
+{
+    amrex::Real R0 = parms.rho_0;
+    for ( amrex::MFIter mfi(rho_hse, amrex::TilingIfNotGPU()); mfi.isValid(); ++mfi )
+    {
+       amrex::Array4<amrex::Real> rho_arr = rho_hse.array(mfi);
+       const amrex::Box& gbx = mfi.growntilebox(1);
+       amrex::ParallelFor(gbx, [=] AMREX_GPU_DEVICE (int i, int j, int k) {
+           rho_arr(i,j,k) = R0;
+       });
+    }
+}
+#else
+void
+erf_init_dens_hse(amrex::Real* dens_hse_ptr,
+                  amrex::Geometry const& geom,
+                  const int ng_dens_hse)
+{
+  const int khi = geom.Domain().bigEnd()[2];
+  for (int k = -ng_dens_hse; k <= khi+ng_dens_hse; k++)
+  {
+      dens_hse_ptr[k] = parms.rho_0;
+  }
+}
+#endif
+
+void
+erf_init_rayleigh(amrex::Vector<amrex::Real>& /*tau*/,
+                  amrex::Vector<amrex::Real>& /*ubar*/,
+                  amrex::Vector<amrex::Real>& /*vbar*/,
+                  amrex::Vector<amrex::Real>& /*thetabar*/,
+                  amrex::Geometry      const& /*geom*/)
+{
+   amrex::Error("Should never get here for WPS tests problem");
+}
+
+// Shouldn't we get rid of this function when initializing with real atm data?
+///*
+void
+init_custom_prob(
+  const amrex::Box& bx,
+  amrex::Array4<amrex::Real> const& state,
+  amrex::Array4<amrex::Real> const& x_vel,
+  amrex::Array4<amrex::Real> const& y_vel,
+  amrex::Array4<amrex::Real> const& z_vel,
+#ifdef ERF_USE_TERRAIN
+  amrex::Array4<amrex::Real> const& r_hse,
+  amrex::Array4<amrex::Real> const& p_hse,
+  amrex::Array4<amrex::Real const> const& z_nd,
+  amrex::Array4<amrex::Real const> const& z_cc,
+#endif
+  amrex::GeometryData const& geomdata)
+{
+  amrex::Print() << "Dummy function..Needed for linking" << std::endl;
+}
+//*/
+
+void
+amrex_probinit(
+  const amrex_real* /*problo*/,
+  const amrex_real* /*probhi*/)
+{
+  // Parse params
+  amrex::ParmParse pp("prob");
+  pp.query("rho_0", parms.rho_0);
+  pp.query("T_0", parms.Theta_0);
+}

Exec/EkmanSpiral/run_convergence_study.sh Exec/EkmanSpiral_custom/run_convergence_study.sh

@@ -0,0 +1,13 @@
+set(erf_exe_name ekman_spiral_input_sounding)
+
+add_executable(${erf_exe_name} "")
+target_sources(${erf_exe_name}
+   PRIVATE
+     prob.H
+     prob.cpp
+)
+
+target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+include(${CMAKE_SOURCE_DIR}/CMake/BuildERFExe.cmake)
+build_erf_exe(${erf_exe_name})

Exec/EkmanSpiral_ideal/CMakeLists.txt

@@ -0,0 +1,37 @@
+# AMReX
+COMP = gnu
+PRECISION = DOUBLE
+
+TEST = TRUE
+USE_ASSERTION = TRUE
+
+# Profiling
+PROFILE = FALSE
+TINY_PROFILE = FALSE
+COMM_PROFILE = FALSE
+TRACE_PROFILE = FALSE
+MEM_PROFILE = FALSE
+USE_GPROF = FALSE
+
+# Performance
+USE_MPI = TRUE
+USE_OMP = FALSE
+USE_CUDA = FALSE
+USE_HIP = FALSE
+USE_DPCPP = FALSE
+
+# Debugging
+DEBUG = FALSE
+DEBUG = TRUE
+
+USE_NETCDF  = FALSE
+USE_TERRAIN = FALSE
+
+BL_NO_FORT = TRUE
+
+# GNU Make
+Bpack := ./Make.package
+Blocs := .
+ERF_HOME := ../..
+ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/EkmanSpiral_input_sounding
+include $(ERF_HOME)/Exec/Make.ERF

Exec/EkmanSpiral_ideal/GNUmakefile

@@ -1,5 +1,5 @@
 # ------------------  INPUTS TO MAIN PROGRAM  -------------------
-max_step = 0
+max_step = 1 
 stop_time = 1000.0
 
 amrex.fpe_trap_invalid = 1
@@ -16,6 +16,10 @@ zlo.type = "NoSlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
+erf.use_native_mri  = 0
+integration.type    = RungeKutta
+integration.rk.type = 3
+
 erf.fixed_dt       = 0.5     # fixed time step
 
 # DIAGNOSTICS & VERBOSITY
@@ -59,6 +63,3 @@ prob.T_0 = 300.0
 # INITIALIZATION WITH ATM DATA
 erf.init_type = "input_sounding"
 erf.input_sounding_file = "input_sounding_file"
-#erf.input_sounding_file = "/home/pkjha/Desktop/input_sounding_file/ekman/input_sounding"
-
-FILE = ./inputs.time_integration

Exec/EkmanSpiral_ideal/Make.package

@@ -0,0 +1,14 @@
+#ifndef _PROB_H_
+#define _PROB_H_
+
+#include <AMReX_REAL.H>
+
+struct ProbParm {
+  amrex::Real rho_0 = 1.0;
+  amrex::Real Theta_0 = 300.0;
+  amrex::Real V_0 = 1.0;
+}; // namespace ProbParm
+
+extern ProbParm parms;
+
+#endif