From d5448bb976471ac790e8587d8c97fabe32958c53 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Wed, 16 Oct 2024 20:05:20 -0700 Subject: [PATCH] remove deprecated use_native_mri flag (#1890) --- Docs/sphinx_doc/Inputs.rst | 5 ++--- Exec/AWAKEN/inputs_All_EWP | 1 - Exec/AWAKEN/inputs_KingPlains_EWP | 1 - Exec/AWAKEN/inputs_KingPlains_Fitch | 1 - Exec/AWAKEN/inputs_KingPlains_SimpleAD | 1 - Exec/EWP/inputs_1WT_lat_lon | 1 - Exec/EWP/inputs_1WT_x_y | 1 - Exec/EWP/inputs_WindFarm_lat_lon | 1 - Exec/EWP/inputs_WindFarm_x_y | 1 - Exec/Radiation/inputs_radiation | 1 - Exec/RegTests/TaylorGreenVortex/inputs_multilevel | 2 -- Exec/SimpleActuatorDisk/inputs_1WT_lat_lon | 1 - Exec/SimpleActuatorDisk/inputs_1WT_x_y | 1 - Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon | 1 - Exec/SimpleActuatorDisk/inputs_WindFarm_x_y | 1 - Exec/SquallLine_2D/inputs_ml | 1 - Exec/SquallLine_2D/inputs_moisture_Gabersek | 1 - Exec/SquallLine_2D/inputs_moisture_SAM | 1 - Exec/SquallLine_2D/inputs_moisture_WRF | 1 - Exec/SuperCell/inputs_moisture | 1 - Exec/SuperCell_3D/inputs_Supercell_3D | 1 - 21 files changed, 2 insertions(+), 24 deletions(-) diff --git a/Docs/sphinx_doc/Inputs.rst b/Docs/sphinx_doc/Inputs.rst index b8f033ab1..791e4d1b9 100644 --- a/Docs/sphinx_doc/Inputs.rst +++ b/Docs/sphinx_doc/Inputs.rst @@ -428,9 +428,8 @@ List of Parameters | | cfl or other | | | | | settings | | | +----------------------------+----------------------+----------------+-------------------+ -| **erf.fixed_fast_dt** | set fast dt | Real > 0 | only relevant | -| | as this value | | if use_native_mri | -| | | | is true | +| **erf.fixed_fast_dt** | set fast dt | Real > 0 | | +| | as this value | | | +----------------------------+----------------------+----------------+-------------------+ | **erf.fixed_mri_dt_ratio** | set fast dt | even int > 0 | only relevant | | | as slow dt / | | if no_substepping | diff --git a/Exec/AWAKEN/inputs_All_EWP b/Exec/AWAKEN/inputs_All_EWP index e5b6f096f..cda4dff42 100644 --- a/Exec/AWAKEN/inputs_All_EWP +++ b/Exec/AWAKEN/inputs_All_EWP @@ -49,7 +49,6 @@ yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.125 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/AWAKEN/inputs_KingPlains_EWP b/Exec/AWAKEN/inputs_KingPlains_EWP index 26ea72b16..653b75e3c 100644 --- a/Exec/AWAKEN/inputs_KingPlains_EWP +++ b/Exec/AWAKEN/inputs_KingPlains_EWP @@ -39,7 +39,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.125 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/AWAKEN/inputs_KingPlains_Fitch b/Exec/AWAKEN/inputs_KingPlains_Fitch index 2e7ae4565..169f2a8d5 100644 --- a/Exec/AWAKEN/inputs_KingPlains_Fitch +++ b/Exec/AWAKEN/inputs_KingPlains_Fitch @@ -39,7 +39,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.125 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/AWAKEN/inputs_KingPlains_SimpleAD b/Exec/AWAKEN/inputs_KingPlains_SimpleAD index 0cccad7aa..9b1822545 100644 --- a/Exec/AWAKEN/inputs_KingPlains_SimpleAD +++ b/Exec/AWAKEN/inputs_KingPlains_SimpleAD @@ -41,7 +41,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.125 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/EWP/inputs_1WT_lat_lon b/Exec/EWP/inputs_1WT_lat_lon index fe77134fb..215618298 100644 --- a/Exec/EWP/inputs_1WT_lat_lon +++ b/Exec/EWP/inputs_1WT_lat_lon @@ -51,7 +51,6 @@ xlo.theta = 300. # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 3.0 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/EWP/inputs_1WT_x_y b/Exec/EWP/inputs_1WT_x_y index ee14f42cf..e9c1296ef 100644 --- a/Exec/EWP/inputs_1WT_x_y +++ b/Exec/EWP/inputs_1WT_x_y @@ -49,7 +49,6 @@ xlo.theta = 300. # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 3.0 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/EWP/inputs_WindFarm_lat_lon b/Exec/EWP/inputs_WindFarm_lat_lon index b3a549ceb..0b4b92a4b 100644 --- a/Exec/EWP/inputs_WindFarm_lat_lon +++ b/Exec/EWP/inputs_WindFarm_lat_lon @@ -36,7 +36,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/EWP/inputs_WindFarm_x_y b/Exec/EWP/inputs_WindFarm_x_y index 19b931695..1f102dc4d 100644 --- a/Exec/EWP/inputs_WindFarm_x_y +++ b/Exec/EWP/inputs_WindFarm_x_y @@ -34,7 +34,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/Radiation/inputs_radiation b/Exec/Radiation/inputs_radiation index 9a3fdcf60..12fcd8e87 100644 --- a/Exec/Radiation/inputs_radiation +++ b/Exec/Radiation/inputs_radiation @@ -18,7 +18,6 @@ zlo.type = "SlipWall" zhi.type = "SlipWall" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 1.0 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.25 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/RegTests/TaylorGreenVortex/inputs_multilevel b/Exec/RegTests/TaylorGreenVortex/inputs_multilevel index e4cb00b3d..e53115628 100644 --- a/Exec/RegTests/TaylorGreenVortex/inputs_multilevel +++ b/Exec/RegTests/TaylorGreenVortex/inputs_multilevel @@ -18,8 +18,6 @@ zhi.type = "SlipWall" erf.fixed_dt = 4e-2 # fixed time step erf.mri_fixed_dt_ratio = 4 -erf.use_native_mri = 0 - # DIAGNOSTICS & VERBOSITY erf.sum_interval = 1 # timesteps between computing mass erf.v = 1 # verbosity in ERF.cpp diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon b/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon index a5d799cfd..ff237b1cc 100644 --- a/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon +++ b/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon @@ -51,7 +51,6 @@ xlo.theta = 300. # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 3.0 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_x_y b/Exec/SimpleActuatorDisk/inputs_1WT_x_y index 6a7986956..4796a2cf4 100644 --- a/Exec/SimpleActuatorDisk/inputs_1WT_x_y +++ b/Exec/SimpleActuatorDisk/inputs_1WT_x_y @@ -49,7 +49,6 @@ xlo.theta = 300. # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.1 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon b/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon index e6ebae87b..8fe3e2e82 100644 --- a/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon +++ b/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon @@ -36,7 +36,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y b/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y index 7fbed1830..72e9af156 100644 --- a/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y +++ b/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y @@ -34,7 +34,6 @@ ylo.type = "Outflow" yhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step depending on grid resolution #erf.fixed_fast_dt = 0.0025 diff --git a/Exec/SquallLine_2D/inputs_ml b/Exec/SquallLine_2D/inputs_ml index 9169252c4..4a4f50617 100644 --- a/Exec/SquallLine_2D/inputs_ml +++ b/Exec/SquallLine_2D/inputs_ml @@ -20,7 +20,6 @@ zlo.type = "SlipWall" zhi.type = "SlipWall" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 1.0 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.5 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/SquallLine_2D/inputs_moisture_Gabersek b/Exec/SquallLine_2D/inputs_moisture_Gabersek index 235ef5941..8c4ac7e2e 100644 --- a/Exec/SquallLine_2D/inputs_moisture_Gabersek +++ b/Exec/SquallLine_2D/inputs_moisture_Gabersek @@ -19,7 +19,6 @@ zlo.type = "SlipWall" zhi.type = "HO_Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.125 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/SquallLine_2D/inputs_moisture_SAM b/Exec/SquallLine_2D/inputs_moisture_SAM index b920bbe5f..3f7ea21b1 100644 --- a/Exec/SquallLine_2D/inputs_moisture_SAM +++ b/Exec/SquallLine_2D/inputs_moisture_SAM @@ -19,7 +19,6 @@ zlo.type = "SlipWall" zhi.type = "Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 1.0 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.5 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/SquallLine_2D/inputs_moisture_WRF b/Exec/SquallLine_2D/inputs_moisture_WRF index 677d5380b..b1fea7fdb 100644 --- a/Exec/SquallLine_2D/inputs_moisture_WRF +++ b/Exec/SquallLine_2D/inputs_moisture_WRF @@ -19,7 +19,6 @@ zlo.type = "SlipWall" zhi.type = "HO_Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 1.0 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.5 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/SuperCell/inputs_moisture b/Exec/SuperCell/inputs_moisture index b363a84cb..92e812fe7 100644 --- a/Exec/SuperCell/inputs_moisture +++ b/Exec/SuperCell/inputs_moisture @@ -18,7 +18,6 @@ zlo.type = "SlipWall" zhi.type = "SlipWall" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 1.0 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.25 # fixed time step [s] -- Straka et al 1993 diff --git a/Exec/SuperCell_3D/inputs_Supercell_3D b/Exec/SuperCell_3D/inputs_Supercell_3D index 3f2daff82..55a6955c5 100644 --- a/Exec/SuperCell_3D/inputs_Supercell_3D +++ b/Exec/SuperCell_3D/inputs_Supercell_3D @@ -22,7 +22,6 @@ zlo.type = "SlipWall" zhi.type = "HO_Outflow" # TIME STEP CONTROL -erf.use_native_mri = 1 erf.fixed_dt = 0.25 # fixed time step [s] -- Straka et al 1993 erf.fixed_fast_dt = 0.125 # fixed time step [s] -- Straka et al 1993