[run-ex] Skipping some environment variables in OpenOil.

Author: knutfrode

opendrift/models/openoil/openoil.py

@@ -233,6 +233,7 @@ class OpenOil(OceanDrift):
         'sea_surface_height': {'fallback': 0},
         'upward_sea_water_velocity': {
             'fallback': 0,
+            'skip_if': ['drift:vertical_advection', 'is', False],
             'important': False
         },
         'sea_surface_wave_significant_height': {
@@ -241,10 +242,12 @@ class OpenOil(OceanDrift):
         },
         'sea_surface_wave_stokes_drift_x_velocity': {
             'fallback': 0,
+            'skip_if': ['drift:stokes_drift', 'is', False],
             'important': False
         },
         'sea_surface_wave_stokes_drift_y_velocity': {
             'fallback': 0,
+            'skip_if': ['drift:stokes_drift', 'is', False],
             'important': False
         },
         'sea_surface_wave_period_at_variance_spectral_density_maximum': {
@@ -282,13 +285,15 @@ class OpenOil(OceanDrift):
         'ocean_vertical_diffusivity': {
             'fallback': 0.02,
             'important': False,
+            'skip_if': ['drift:vertical_mixing', 'is', False],
             'profiles': True
         },
         'land_binary_mask': {
             'fallback': None
         },
         'ocean_mixed_layer_thickness': {
             'fallback': 50,
+            'skip_if': ['drift:vertical_mixing', 'is', False],
             'important': False
         },
     }

tests/models/openoil/test_oillibrary.py

@@ -303,7 +303,7 @@ def test_seed_metadata_output():
     output_variables = {
         np.float64: ['time'],
         np.int32: ['trajectory', 'status', 'moving', 'origin_marker'],
-        np.float32: ['lon' ,'lat' ,'z' ,'diameter' ,'ocean_vertical_diffusivity' ,'interfacial_area' ,'land_binary_mask' ,'viscosity' ,'density' ,'mass_oil' ,'mass_dispersed' ,'mass_evaporated' ,'fraction_evaporated' ,'water_fraction' ,'wind_drift_factor' ,'x_sea_water_velocity' ,'y_sea_water_velocity' ,'sea_surface_wave_stokes_drift_x_velocity' ,'sea_surface_wave_period_at_variance_spectral_density_maximum' ,'sea_surface_wave_significant_height', 'sea_surface_wave_stokes_drift_y_velocity' ,'sea_floor_depth_below_sea_level' ,'sea_ice_area_fraction' ,'sea_water_temperature' ,'sea_water_salinity' ,'upward_sea_water_velocity', 'bulltime' ,'age_seconds', 'x_wind' ,'y_wind']
+        np.float32: ['lon' ,'lat' ,'z' ,'diameter' ,'ocean_vertical_diffusivity' ,'interfacial_area' ,'land_binary_mask' ,'viscosity' ,'density' ,'mass_oil' ,'mass_dispersed' ,'mass_evaporated' ,'fraction_evaporated' ,'water_fraction' ,'wind_drift_factor' ,'x_sea_water_velocity' ,'y_sea_water_velocity' ,'sea_surface_wave_stokes_drift_x_velocity' ,'sea_surface_wave_period_at_variance_spectral_density_maximum' ,'sea_surface_wave_significant_height', 'sea_surface_wave_stokes_drift_y_velocity' ,'sea_floor_depth_below_sea_level' ,'sea_ice_area_fraction' ,'sea_water_temperature' ,'sea_water_salinity','bulltime' ,'age_seconds', 'x_wind' ,'y_wind']
         }
     d = netCDF4.Dataset(outfile, 'r')
     for dtype, vars in output_variables.items():