diff --git a/components/eamxx/tests/uncoupled/mam4_wet_scav/CMakeLists.txt b/components/eamxx/tests/uncoupled/mam4_wet_scav/CMakeLists.txt deleted file mode 100644 index 8558f6fbb05..00000000000 --- a/components/eamxx/tests/uncoupled/mam4_wet_scav/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -include (ScreamUtils) - -# This test needs to be reworked for microphysics -- currently it's still using -# input for nucleation. - -# Create the test -CreateADUnitTest(mam4_wetscav_standalone - LABELS mam4_wetscav physics - LIBS mam - MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END} -) - -# Set AD configurable options -set (ATM_TIME_STEP 1) -SetVarDependingOnTestSize(NUM_STEPS 2 2 2) -set (RUN_T0 2021-10-12-45000) - -# ## Copy (and configure) yaml files needed by tests -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/input.yaml - ${CMAKE_CURRENT_BINARY_DIR}/input.yaml) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml - ${CMAKE_CURRENT_BINARY_DIR}/output.yaml) - -# Ensure test input files are present in the data dir -set (TEST_INPUT_FILES - scream/init/scream_unit_tests_aerosol_optics_ne2np4L72_20220822.nc -) -foreach (file IN ITEMS ${TEST_INPUT_FILES}) - GetInputFile(${file}) -endforeach() diff --git a/components/eamxx/tests/uncoupled/mam4_wet_scav/input.yaml b/components/eamxx/tests/uncoupled/mam4_wet_scav/input.yaml deleted file mode 100644 index c73e2dbaa9a..00000000000 --- a/components/eamxx/tests/uncoupled/mam4_wet_scav/input.yaml +++ /dev/null @@ -1,70 +0,0 @@ -%YAML 1.1 ---- -driver_options: - atmosphere_dag_verbosity_level: 5 - -time_stepping: - time_step: ${ATM_TIME_STEP} - run_t0: ${RUN_T0} # YYYY-MM-DD-XXXXX - number_of_steps: ${NUM_STEPS} - -atmosphere_processes: - atm_procs_list: [mam4_wetscav] - mam_wetscav: - number_of_subcycles: ${NUM_SUBCYCLES} - compute_tendencies: [all] - lambda_low: 0.001 - -grids_manager: - Type: Mesh Free - grids_names: [Physics] - Physics: - type: point_grid - number_of_global_columns: 218 - number_of_vertical_levels: 72 - -initial_conditions: - Filename: ${SCREAM_DATA_DIR}/init/scream_unit_tests_aerosol_optics_ne2np4L72_20220822.nc - topography_filename: ${TOPO_DATA_DIR}/${EAMxx_tests_TOPO_FILE} - cldn_prev_step: 0.5 - rprdsh: 1e-5 - rprddp: 1e-5 - evapcsh: 1e-5 - evapcdp: 1e-5 - cldt_prev_step: 1e-5 - cldst: 1e-5 - qme: 1e-5 - prain: 1e-5 - evapr: 1e-5 - icwmrdp: 1e-5 - icwmrsh: 1e-5 - rprddp: 1e-5 - rprdsh: 1e-5 - sh_frac: 1e-5 - dp_frac: 1e-5 - evapcsh: 1e-5 - evapcdp: 1e-5 - bcphiwet: 1e-5 # wet deposition of hydrophilic black carbon [kg/m2/s] - bcphidry: 1e-5 # dry deposition of hydrophilic black carbon [kg/m2/s] - ocphiwet: 1e-5 # wet deposition of hydrophilic organic carbon [kg/m2/s] - ocphidry: 1e-5 # dry deposition of hydrophilic organic carbon [kg/m2/s] - dstwet1: 1e-5 # wet deposition of dust (bin1) [kg/m2/s] - dstwet2: 1e-5 # wet deposition of dust (bin2) [kg/m2/s] - dstwet3: 1e-5 # wet deposition of dust (bin3) [kg/m2/s] - dstwet4: 1e-5 # wet deposition of dust (bin4) [kg/m2/s] - pbuf: 1e-5 # cloud-borne aerosols - dgncur_a: 1e-5 # aerosol particle diameter [m] - wetdens: 1e-5 # wet aerosol density [kg/m3] - qaerwat: 1e-5 # aerosol water [kg/kg] - dgnumwet: 1e-5 # wet aerosol diameter [m] - fracis: 1e-5 # fraction of transported species that are insoluble [fraction] - cldfrac_tot: 0.5 - pbl_height: 25.0 - phis : 0.1 - dlf : 0.0 - dp_ccf : 0.0 - sh_ccf : 0.0 -# The parameters for I/O control -Scorpio: - output_yaml_files: ["output.yaml"] -... diff --git a/components/eamxx/tests/uncoupled/mam4_wet_scav/mam4_wetscav_standalone.cpp b/components/eamxx/tests/uncoupled/mam4_wet_scav/mam4_wetscav_standalone.cpp deleted file mode 100644 index 203b51681d0..00000000000 --- a/components/eamxx/tests/uncoupled/mam4_wet_scav/mam4_wetscav_standalone.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include - -#include "control/atmosphere_driver.hpp" -#include "diagnostics/register_diagnostics.hpp" - -#include "physics/register_physics.hpp" -#include "physics/mam/eamxx_mam_wetscav_process_interface.hpp" - -#include "share/grid/mesh_free_grids_manager.hpp" -#include "share/atm_process/atmosphere_process.hpp" - -#include "ekat/ekat_parse_yaml_file.hpp" -#include "ekat/logging/ekat_logger.hpp" - -#include - -namespace scream { - -TEST_CASE("mam4_wetscav-stand-alone", "") { - using namespace scream; - using namespace scream::control; - - // Create a comm - ekat::Comm atm_comm (MPI_COMM_WORLD); - - // Load ad parameter list - std::string fname = "input.yaml"; - ekat::ParameterList ad_params("Atmosphere Driver"); - parse_yaml_file(fname,ad_params); - logger.debug("yaml parsed."); - - // Time stepping parameters - const auto& ts = ad_params.sublist("time_stepping"); - const auto dt = ts.get("time_step"); - const auto nsteps = ts.get("number_of_steps"); - const auto t0_str = ts.get("run_t0"); - const auto t0 = util::str_to_time_stamp(t0_str); - - logger.info("running MAMWetscav standalone test with dt = {} for {} steps.", dt, nsteps); - EKAT_ASSERT_MSG (dt>0, "Error! Time step must be positive.\n"); - - // Need to register products in the factory *before* we create any atm process or grids manager. - register_physics(); - register_mesh_free_grids_manager(); - register_diagnostics(); - logger.debug("products registered."); - - // Create the driver - AtmosphereDriver ad; - logger.debug("driver created."); - - // Init and run - ad.initialize(atm_comm,ad_params,t0); - logger.debug("driver initialized."); - - logger.info("Start time stepping loop ... [0%]"); - for (int i=0; i