Merge pull request #1635 from knutfrode/dev

[run-ex] Remove unused variables from OceanDrift.required_variables

Author: knutfrode

examples/example_2d.py

@@ -16,7 +16,6 @@
 o.set_config('environment:fallback:x_sea_water_velocity', .1)
 o.set_config('environment:fallback:sea_surface_wave_stokes_drift_x_velocity', .2)
 o.set_config('environment:fallback:sea_surface_wave_significant_height', 2)
-o.set_config('environment:fallback:sea_surface_wave_period_at_variance_spectral_density_maximum', 8)
 
 #%%
 # Seed elements between surface and 5m depth

opendrift/models/oceandrift.py

@@ -83,16 +83,8 @@ class OceanDrift(OpenDriftSimulation):
             'skip_if': ['drift:stokes_drift', 'is', False]},
         'sea_surface_wave_stokes_drift_y_velocity': {'fallback': 0,
             'skip_if': ['drift:stokes_drift', 'is', False]},
-        'sea_surface_wave_period_at_variance_spectral_density_maximum':
-            {'fallback': 0},
-        'sea_surface_wave_mean_period_from_variance_spectral_density_second_frequency_moment': {'fallback': 0},
-        'sea_surface_swell_wave_to_direction': {'fallback': 0, 'important': False},
-        'sea_surface_swell_wave_peak_period_from_variance_spectral_density': {'fallback': 0, 'important': False},
-        'sea_surface_swell_wave_significant_height': {'fallback': 0, 'important': False},
-        'sea_surface_wind_wave_to_direction': {'fallback': 0, 'important': False},
-        'sea_surface_wind_wave_mean_period': {'fallback': 0, 'important': False},
-        'sea_surface_wind_wave_significant_height': {'fallback': 0, 'important': False},
-        'ocean_mixed_layer_thickness': {'fallback': 50},
+        'ocean_mixed_layer_thickness': {
+            'fallback': 50, 'skip_if': ['drift:vertical_mixing', 'is', False]},
         'sea_floor_depth_below_sea_level': {'fallback': 10000},
         'land_binary_mask': {'fallback': None},
         }

tests/models/test_basemodel.py

@@ -10,7 +10,7 @@
 def test_logging(tmpdir, capsys):
     # Accepting small variations in log output,
     # depending on machine, and from which folder test is run
-    accepted = (262, 265)
+    accepted = (219, 222)
 
     # Logging to console
     logfile = None