removing hardcoding from scenario subroutines; updating test_scenario with setters

Author: zdaq12

src/scenario.F90

@@ -51,12 +51,8 @@ subroutine f_scenario_loss_rate(scenario_ptr_c, vol, density, aero_data_ptr_c, e
     call c_f_pointer(aero_data_ptr_c, aero_data_ptr_f)
     call c_f_pointer(env_state_ptr_c, env_state_ptr_f)
 
-    call fractal_set_spherical(aero_data_ptr_f%fractal)
-
-    env_state_ptr_f%height = 1
-    env_state_ptr_f%temp = 300
-    env_state_ptr_f%pressure =  101325
     rate = scenario_loss_rate(scenario_ptr_f, vol, density, aero_data_ptr_f, env_state_ptr_f)
+
   end subroutine
 
   subroutine f_scenario_loss_rate_dry_dep(vol, density, aero_data_ptr_c, env_state_ptr_c, rate) bind(C)
@@ -69,12 +65,8 @@ subroutine f_scenario_loss_rate_dry_dep(vol, density, aero_data_ptr_c, env_state
     call c_f_pointer(aero_data_ptr_c, aero_data_ptr_f)
     call c_f_pointer(env_state_ptr_c, env_state_ptr_f)
 
-    call fractal_set_spherical(aero_data_ptr_f%fractal)
-
-    env_state_ptr_f%height = 1
-    env_state_ptr_f%temp = 300
-    env_state_ptr_f%pressure =  101325
     rate = scenario_loss_rate_dry_dep(vol, density, aero_data_ptr_f, env_state_ptr_f)
+
   end subroutine
 
 end module

tests/test_scenario.py

@@ -126,7 +126,8 @@ def test_str():
         'none',
         'constant',
         'volume',
-        'drydep'))
+        'drydep',
+        'chamber'))
     def test_loss_rate(loss_function_param:str):
         # arrange
         aero_data = ppmc.AeroData(AERO_DATA_CTOR_ARG_MINIMAL)
@@ -137,10 +138,15 @@ def test_loss_rate(loss_function_param:str):
         scenario = ppmc.Scenario(gas_data, aero_data, scenario_ctor_arg)
         vol =  (4/3)*np.pi*(1e-6)**3
         density = 1
+        env_state.height = 1
+        env_state.set_temperature(300)
+        env_state.pressure = 101325
+        aero_data.frac_dim = 3
+        aero_data.prime_radius = 1e-8
+        aero_data.vol_fill_factor = 1
 
         # act
         rate = ppmc.loss_rate(scenario, vol, density, aero_data, env_state)
-        print(rate)
 
         # assert
         assert rate is not nan
@@ -152,6 +158,12 @@ def test_loss_rate_dry_dep():
         env_state = ppmc.EnvState(ENV_STATE_CTOR_ARG_MINIMAL)
         vol =  (4/3)*np.pi*(1e-6)**3
         density = 1
+        env_state.height = 1
+        env_state.set_temperature(300)
+        env_state.pressure = 101325
+        aero_data.frac_dim = 3
+        aero_data.prime_radius = 1e-8
+        aero_data.vol_fill_factor = 1
 
         # act
         rate = ppmc.loss_rate_dry_dep(vol, density, aero_data, env_state)