Changeset 97f4f4c in flex_extract.git for source/python/classes
- Timestamp:
- Nov 30, 2018, 6:26:24 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 3f36e42
- Parents:
- 1d15e27
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
source/python/classes/ControlFile.py
r631ba13 r97f4f4c 61 61 import _config 62 62 from mods.tools import my_error, silent_remove 63 from mods.checks import check_grid_area 63 64 64 65 # ------------------------------------------------------------------------------ … … 475 476 self.accmaxstep='12' 476 477 477 # if area was provided (only from commandline) 478 # decompose area into its 4 components 479 if self.area: 480 components = self.area.split('/') 481 self.upper, self.left, self.lower, self.right = components 478 479 self.grid, self.area = check_grid_area(self.grid, self.area, 480 self.upper, self.lower, 481 self.left, self.right) 482 483 482 484 483 485 # convert grid and area components to correct format and input 484 if 'N' in self.grid: # Gaussian output grid 485 self.area = 'G' 486 else: 487 # check on grid format 488 if float(self.grid) / 100. >= 0.5: 489 # grid is defined in 1/1000 degrees; old method 490 self.grid = '{}/{}'.format(float(self.grid) / 1000., 491 float(self.grid) / 1000.) 492 self.area = '{}/{}/{}/{}'.format(float(self.upper) / 1000., 493 float(self.left) / 1000., 494 float(self.lower) / 1000., 495 float(self.right) / 1000.) 496 elif float(self.grid) / 100. < 0.5: 497 # grid is defined in normal degree; new method 498 self.grid = '{}/{}'.format(float(self.grid), float(self.grid)) 499 self.area = '{}/{}/{}/{}'.format(float(self.upper), 500 float(self.left), 501 float(self.lower), 502 float(self.right)) 486 #if 'N' in self.grid: # Gaussian output grid 487 # self.area = 'G' 488 # else: 489 # if '/' in self.grid: 490 # gridx, gridy = self.grid.split('/') 491 # if gridx == gridy: 492 # self.grid = gridx 493 494 495 # # check on grid format 496 # if float(self.grid) / 100. >= 0.5: 497 # # grid is defined in 1/1000 degrees; old format 498 # self.grid = '{}/{}'.format(float(self.grid) / 1000., 499 # float(self.grid) / 1000.) 500 # self.area = '{}/{}/{}/{}'.format(float(self.upper) / 1000., 501 # float(self.left) / 1000., 502 # float(self.lower) / 1000., 503 # float(self.right) / 1000.) 504 # elif float(self.grid) / 100. < 0.5: 505 # # grid is defined in normal degree; new format 506 # self.grid = '{}/{}'.format(float(self.grid), float(self.grid)) 507 # self.area = '{}/{}/{}/{}'.format(float(self.upper), 508 # float(self.left), 509 # float(self.lower), 510 # float(self.right)) 503 511 504 512 return
Note: See TracChangeset
for help on using the changeset viewer.