Merge pull request #1485 from knutfrode/dev

Removed obsolete method ShipDrift.import_ascii_format, which I believ…

opendrift/models/shipdrift.py

@@ -342,45 +342,3 @@ def update(self):
         # Stranding
         self.deactivate_elements(self.environment.land_binary_mask == 1,
                                  reason='ship stranded')
-
-    def import_ascii_format(self, filename):
-
-        with open(filename) as f:
-            lines = f.readlines()
-        self.time_step_output, self.time_step = lines[16].split()
-        num_elements = int(lines[25].split()[0])
-        if num_elements != 1:
-            raise ValueError('Import presently only supports single ship')
-        num_timesteps = (len(lines)-30.)/14.
-        num_timesteps = int(num_timesteps)
-
-        # Initialise history array
-        from datetime import datetime, timedelta
-        history_dtype_fields = [
-            (name, self.ElementType.variables[name]['dtype'])
-            for name in self.ElementType.variables]
-        # Add environment variables
-        self.history_metadata = self.ElementType.variables.copy()
-        for env_var in self.required_variables:
-            history_dtype_fields.append((env_var, np.dtype('float32')))
-            self.history_metadata[env_var] = {}
-        history_dtype = np.dtype(history_dtype_fields)
-
-        self.history = np.ma.array(
-	        np.zeros([num_elements, num_timesteps]),
-            dtype=history_dtype, mask=[True])
-
-        self.steps_output = num_timesteps
-        self.steps = num_timesteps
-        self.start_time = datetime.now()
-        self.end_time = datetime.now() + timedelta(hours=1)
-        self.time = self.end_time
-
-        # Read time steps from file
-        for i in range(num_timesteps):
-            line = lines[30 + 14*i + 13]
-            l = line.split()
-            lon = float(l[2])
-            lat = float(l[3])
-            self.history['lon'][0, i] = lon
-            self.history['lat'][0, i] = lat