/[escript]/trunk/downunder/py_src/datasources.py
ViewVC logotype

Log of /trunk/downunder/py_src/datasources.py

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 4390 - (view) (annotate) - [select for diffs]
Modified Mon May 6 01:59:34 2013 UTC (6 years, 5 months ago) by caltinay
File length: 46837 byte(s)
Diff to previous 4376
Fixed advertising of NetCdfData availability.


Revision 4376 - (view) (annotate) - [select for diffs]
Modified Mon Apr 22 08:44:45 2013 UTC (6 years, 5 months ago) by gross
File length: 46781 byte(s)
Diff to previous 4373
domumentation update on coordinate systems - part I

Revision 4373 - (view) (annotate) - [select for diffs]
Modified Mon Apr 22 03:16:24 2013 UTC (6 years, 5 months ago) by gross
File length: 46766 byte(s)
Diff to previous 4362
more on geodetic coordinates

Revision 4362 - (view) (annotate) - [select for diffs]
Modified Tue Apr 16 04:37:13 2013 UTC (6 years, 6 months ago) by caltinay
File length: 45315 byte(s)
Diff to previous 4344
Implemented NumpyData downunder source (w/ tests).
Added check of data dimensionality to domainbuilder since data_dim must equal
domain_dim-1 at the moment.


Revision 4344 - (view) (annotate) - [select for diffs]
Modified Wed Mar 27 07:58:34 2013 UTC (6 years, 6 months ago) by gross
File length: 40841 byte(s)
Diff to previous 4287
fix potential at botttom added.

Revision 4287 - (view) (annotate) - [select for diffs]
Modified Thu Mar 7 05:26:44 2013 UTC (6 years, 7 months ago) by caltinay
File length: 40784 byte(s)
Diff to previous 4283
Removed simpleGeoMagnetic field function from doco and example source.


Revision 4283 - (view) (annotate) - [select for diffs]
Modified Thu Mar 7 00:11:36 2013 UTC (6 years, 7 months ago) by caltinay
File length: 41258 byte(s)
Diff to previous 4277
Minor epydoc fixes.


Revision 4277 - (view) (annotate) - [select for diffs]
Modified Wed Mar 6 01:30:41 2013 UTC (6 years, 7 months ago) by caltinay
File length: 41254 byte(s)
Diff to previous 4267
Implemented claimed support for mixing data with different resolutions.


Revision 4267 - (view) (annotate) - [select for diffs]
Modified Fri Mar 1 04:50:54 2013 UTC (6 years, 7 months ago) by caltinay
File length: 40599 byte(s)
Diff to previous 4262
Updated inversion example scripts, added ER Mapper data, checked results
and corrected some issues. Cookbook does not reflect the changes yet.


Revision 4262 - (view) (annotate) - [select for diffs]
Modified Thu Feb 28 05:49:11 2013 UTC (6 years, 7 months ago) by caltinay
File length: 40602 byte(s)
Diff to previous 4239
removed use of xrange and hack.


Revision 4239 - (view) (annotate) - [select for diffs]
Modified Fri Feb 22 00:35:01 2013 UTC (6 years, 7 months ago) by caltinay
File length: 40660 byte(s)
Diff to previous 4238
initialize utm zone in er mapper reader.


Revision 4238 - (view) (annotate) - [select for diffs]
Modified Thu Feb 21 09:58:49 2013 UTC (6 years, 7 months ago) by jfenwick
File length: 40629 byte(s)
Diff to previous 4227
fixed some relative imports and uses of xrange

Revision 4227 - (view) (annotate) - [select for diffs]
Modified Wed Feb 20 03:10:50 2013 UTC (6 years, 7 months ago) by caltinay
File length: 40572 byte(s)
Diff to previous 4212
ER Mapper data source updates.


Revision 4212 - (view) (annotate) - [select for diffs]
Modified Tue Feb 19 00:11:28 2013 UTC (6 years, 7 months ago) by caltinay
File length: 37580 byte(s)
Diff to previous 4201
Even friendlier message when pyproj is not installed but required.


Revision 4201 - (view) (annotate) - [select for diffs]
Modified Thu Feb 14 06:40:01 2013 UTC (6 years, 8 months ago) by caltinay
File length: 37473 byte(s)
Diff to previous 4197
DomainBuilder now ensures all data is in same UTM zone (with test).


Revision 4197 - (view) (annotate) - [select for diffs]
Modified Wed Feb 13 05:53:19 2013 UTC (6 years, 8 months ago) by caltinay
File length: 36750 byte(s)
Diff to previous 4196
Changes to netCDF data source:
-removed assumptions
-added parameters to override data/error variable names, scale factor and null
value.


Revision 4196 - (view) (annotate) - [select for diffs]
Modified Wed Feb 13 00:58:37 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33948 byte(s)
Diff to previous 4179
Small fix so ERS files with DOS newline are parsed correctly.


Revision 4179 - (view) (annotate) - [select for diffs]
Modified Thu Jan 31 04:30:50 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33940 byte(s)
Diff to previous 4178
More doco.


Revision 4178 - (view) (annotate) - [select for diffs]
Modified Thu Jan 31 03:18:56 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33819 byte(s)
Diff to previous 4174
Some more doco.


Revision 4174 - (view) (annotate) - [select for diffs]
Modified Wed Jan 30 03:21:27 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33161 byte(s)
Diff to previous 4162
ripley's readBinaryGrid and readNcGrid now filter out NaN leaving the relevant
destination data points untouched.


Revision 4162 - (view) (annotate) - [select for diffs]
Modified Thu Jan 24 03:53:19 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33220 byte(s)
Diff to previous 4152
Added missing example file to display netcdf data.


Revision 4152 - (view) (annotate) - [select for diffs]
Modified Tue Jan 22 00:29:03 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33217 byte(s)
Diff to previous 4145
Moved figures to subdirectory.


Revision 4145 - (view) (annotate) - [select for diffs]
Modified Fri Jan 18 00:51:49 2013 UTC (6 years, 8 months ago) by caltinay
File length: 33026 byte(s)
Diff to previous 4132
Checkpoint.


Revision 4132 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 05:46:49 2013 UTC (6 years, 9 months ago) by caltinay
File length: 33066 byte(s)
Diff to previous 4125
Range of epydoc fixes.


Revision 4125 - (view) (annotate) - [select for diffs]
Modified Wed Jan 2 06:15:00 2013 UTC (6 years, 9 months ago) by gross
File length: 31943 byte(s)
Diff to previous 4121
some fixes in the inversion set-up

Revision 4121 - (view) (annotate) - [select for diffs]
Modified Wed Dec 19 00:24:50 2012 UTC (6 years, 9 months ago) by gross
File length: 31978 byte(s)
Diff to previous 4116
changes to the boundary conditions.

Revision 4116 - (view) (annotate) - [select for diffs]
Modified Fri Dec 14 07:21:14 2012 UTC (6 years, 10 months ago) by gross
File length: 31916 byte(s)
Diff to previous 4115
tests for oscillatory data added.

Revision 4115 - (view) (annotate) - [select for diffs]
Modified Fri Dec 14 04:48:48 2012 UTC (6 years, 10 months ago) by gross
File length: 31525 byte(s)
Diff to previous 4108
terminolgy for magnetic flux density clarified. clean up on synthetic data

Revision 4108 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 06:38:11 2012 UTC (6 years, 10 months ago) by caltinay
File length: 23235 byte(s)
Diff to previous 4106
Changed methods to add padding areas.


Revision 4106 - (view) (annotate) - [select for diffs]
Modified Thu Dec 13 05:08:44 2012 UTC (6 years, 10 months ago) by gross
File length: 23259 byte(s)
Diff to previous 4097
some clarification on how to handle back ground magnetic field plus renaming of SyntheticData

Revision 4097 - (view) (annotate) - [select for diffs]
Modified Fri Dec 7 01:18:35 2012 UTC (6 years, 10 months ago) by caltinay
File length: 23010 byte(s)
Diff to previous 4080
Minor edits.


Revision 4080 - (view) (annotate) - [select for diffs]
Modified Mon Nov 19 01:45:38 2012 UTC (6 years, 10 months ago) by jfenwick
File length: 22988 byte(s)
Diff to previous 4079
Epydoc fixes


Revision 4079 - (view) (annotate) - [select for diffs]
Modified Fri Nov 16 07:59:01 2012 UTC (6 years, 11 months ago) by gross
File length: 22988 byte(s)
Diff to previous 4061
some modifications to scaling in downunder. still not perfect.

Revision 4061 - (view) (annotate) - [select for diffs]
Modified Fri Nov 9 04:05:28 2012 UTC (6 years, 11 months ago) by caltinay
File length: 23015 byte(s)
Diff to previous 4060
Updated data source test cases.


Revision 4060 - (view) (annotate) - [select for diffs]
Modified Fri Nov 9 03:50:19 2012 UTC (6 years, 11 months ago) by caltinay
File length: 22950 byte(s)
Diff to previous 4053
-Overhaul of inversion data sources. Domain is now generated and managed by separate class.
-Removed UBCDataSource which was only used for testing.
-Updated example scripts.


Revision 4053 - (view) (annotate) - [select for diffs]
Modified Wed Oct 31 07:27:35 2012 UTC (6 years, 11 months ago) by caltinay
File length: 36929 byte(s)
Diff to previous 4049
Do not fix potential on sides of domain by default.


Revision 4049 - (view) (annotate) - [select for diffs]
Modified Wed Oct 31 00:50:50 2012 UTC (6 years, 11 months ago) by caltinay
File length: 36433 byte(s)
Diff to previous 4047
Fixed typos.


Revision 4047 - (view) (annotate) - [select for diffs]
Modified Tue Oct 30 09:10:07 2012 UTC (6 years, 11 months ago) by gross
File length: 35666 byte(s)
Diff to previous 4044
More on magnetic inversion

Revision 4044 - (view) (annotate) - [select for diffs]
Modified Tue Oct 30 03:35:17 2012 UTC (6 years, 11 months ago) by caltinay
File length: 34865 byte(s)
Diff to previous 4041
Some doco fixes for downunder.


Revision 4041 - (view) (annotate) - [select for diffs]
Modified Sun Oct 28 23:42:35 2012 UTC (6 years, 11 months ago) by caltinay
File length: 35828 byte(s)
Diff to previous 4040
Fixed a typo


Revision 4040 - (view) (annotate) - [select for diffs]
Modified Sun Oct 28 22:37:45 2012 UTC (6 years, 11 months ago) by jfenwick
File length: 35691 byte(s)
Diff to previous 4039
Some py3 changes that didn't get committed for some reason


Revision 4039 - (view) (annotate) - [select for diffs]
Modified Fri Oct 26 07:34:06 2012 UTC (6 years, 11 months ago) by gross
File length: 35690 byte(s)
Diff to previous 4034
magnetic inversion added

Revision 4034 - (view) (annotate) - [select for diffs]
Modified Thu Oct 25 02:54:01 2012 UTC (6 years, 11 months ago) by caltinay
File length: 32450 byte(s)
Diff to previous 4032
Fixes to inversion. Using resetRightHandSideCoefficients() now.


Revision 4032 - (view) (annotate) - [select for diffs]
Modified Wed Oct 24 08:06:15 2012 UTC (6 years, 11 months ago) by gross
File length: 32460 byte(s)
Diff to previous 4021
Gravity inversion is disconnect from DataSource objects now in order to allow for more  flexibility
when it comes to the definition of of Mapping and Regulariztion. GravityInversion does not hold a reference to the datasource object anymore.

use   inv=GravityInversion()
      inv.setUp(datasource) 

rather than inv.setDataSource(datasource); inv.setUp()




Revision 4021 - (view) (annotate) - [select for diffs]
Modified Mon Oct 15 02:31:00 2012 UTC (7 years ago) by jfenwick
File length: 32451 byte(s)
Diff to previous 4020
Doco fixes.
Unit test fix for sys.version_info type change


Revision 4020 - (view) (annotate) - [select for diffs]
Modified Thu Oct 11 22:27:33 2012 UTC (7 years ago) by caltinay
File length: 32454 byte(s)
Diff to previous 4019
Removed print() that slipped in in last commit.


Revision 4019 - (view) (annotate) - [select for diffs]
Modified Thu Oct 11 08:12:55 2012 UTC (7 years ago) by jfenwick
File length: 32454 byte(s)
Diff to previous 4016
More tabbing errors,
range/xrange
...

Revision 4016 - (view) (annotate) - [select for diffs]
Modified Tue Oct 9 03:50:27 2012 UTC (7 years ago) by caltinay
File length: 32396 byte(s)
Diff to previous 4014
Skip data source tests under MPI for now as there is no straightforward way
of comparing the data (saveVTK appears to be the best option).


Revision 4014 - (view) (annotate) - [select for diffs]
Modified Thu Oct 4 03:28:35 2012 UTC (7 years ago) by caltinay
File length: 32144 byte(s)
Diff to previous 4009
Changed data source to use ripley's netCDF reader,
added tests and changed ERMapper test to have different x and y sizes.


Revision 4009 - (view) (annotate) - [select for diffs]
Modified Tue Oct 2 05:53:37 2012 UTC (7 years ago) by caltinay
File length: 32699 byte(s)
Diff to previous 4007
don't try to flip y-coord in reader. some more fixes and doco.


Revision 4007 - (view) (annotate) - [select for diffs]
Modified Tue Oct 2 02:12:01 2012 UTC (7 years ago) by caltinay
File length: 32427 byte(s)
Diff to previous 4005
Doco updates.
Data source paddings now take x,y not xy,z as Z padding can be done by setting
vertical extents.


Revision 4005 - (view) (annotate) - [select for diffs]
Modified Fri Sep 28 06:09:03 2012 UTC (7 years ago) by caltinay
File length: 32210 byte(s)
Diff to previous 3988
test fixes, doco updates, annoyance removals.


Revision 3988 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 01:08:19 2012 UTC (7 years ago) by caltinay
File length: 30832 byte(s)
Diff to previous 3986
Scale coordinates if pyproj is not available


Revision 3986 - (view) (annotate) - [select for diffs]
Modified Sun Sep 23 23:01:10 2012 UTC (7 years ago) by caltinay
File length: 30819 byte(s)
Diff to previous 3983
Added explicit cast to make osx happy.


Revision 3983 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 06:41:03 2012 UTC (7 years ago) by caltinay
File length: 30807 byte(s)
Diff to previous 3981
Use ReducedFunction for data sources.


Revision 3981 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 02:47:54 2012 UTC (7 years ago) by jfenwick
File length: 30784 byte(s)
Diff to previous 3980
First pass of updating copyright notices

Revision 3980 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 01:55:39 2012 UTC (7 years ago) by caltinay
File length: 30722 byte(s)
Diff to previous 3972
Now using NullCellValue to initialise data object for ERS reader.


Revision 3972 - (view) (annotate) - [select for diffs]
Modified Wed Sep 19 03:08:39 2012 UTC (7 years ago) by caltinay
File length: 30726 byte(s)
Diff to previous 3971
Can now constrain sides of domain.


Revision 3971 - (view) (annotate) - [select for diffs]
Modified Wed Sep 19 02:55:35 2012 UTC (7 years ago) by caltinay
File length: 30539 byte(s)
Diff to previous 3966
Implemented binary grid reader in ripley which is now used in ER Mapper source.
Interface/details likely to change but need to get this running now.


Revision 3966 - (view) (annotate) - [select for diffs]
Modified Mon Sep 17 00:45:39 2012 UTC (7 years, 1 month ago) by caltinay
File length: 31295 byte(s)
Diff to previous 3965
Changed unit scale for ER Mapper files. Fixed an issue with UBC source.


Revision 3965 - (view) (annotate) - [select for diffs]
Modified Fri Sep 14 01:23:17 2012 UTC (7 years, 1 month ago) by caltinay
File length: 31292 byte(s)
Diff to previous 3964
Data sources have to end up in the Function fs or we get into trouble when
interpolating. Now using setValueOfDataPoint() which doesn't seem to slow
things down too much.


Revision 3964 - (view) (annotate) - [select for diffs]
Modified Thu Sep 13 03:49:55 2012 UTC (7 years, 1 month ago) by caltinay
File length: 29987 byte(s)
Diff to previous 3960
Hopefully this will fix the interpolation in data sources.


Revision 3960 - (view) (annotate) - [select for diffs]
Modified Mon Sep 10 01:39:40 2012 UTC (7 years, 1 month ago) by caltinay
File length: 31389 byte(s)
Diff to previous 3959
Added accessors to fwd model, regularization and cost function plus access
to gravity survey data.


Revision 3959 - (view) (annotate) - [select for diffs]
Modified Fri Sep 7 04:48:07 2012 UTC (7 years, 1 month ago) by caltinay
File length: 31053 byte(s)
Diff to previous 3958
support for geodetic coordinates in ER Mapper files. Correction to UTM
conversion (now assumes southern hemisphere).


Revision 3958 - (view) (annotate) - [select for diffs]
Modified Fri Sep 7 02:56:42 2012 UTC (7 years, 1 month ago) by caltinay
File length: 29561 byte(s)
Diff to previous 3957
Fixes to netcdf data source and new ERS (ER Mapper) datasource.


Revision 3957 - (view) (annotate) - [select for diffs]
Modified Wed Sep 5 23:49:23 2012 UTC (7 years, 1 month ago) by caltinay
File length: 21506 byte(s)
Diff to previous 3956
Do not require pyproj module-wide. Print a warning if it is not available but
needed instead of raising an exception.


Revision 3956 - (view) (annotate) - [select for diffs]
Modified Wed Sep 5 04:57:43 2012 UTC (7 years, 1 month ago) by caltinay
File length: 20875 byte(s)
Diff to previous 3947
Fixes to netcdf reader for inversions.


Revision 3947 - (view) (annotate) - [select for diffs]
Modified Wed Aug 22 23:19:10 2012 UTC (7 years, 1 month ago) by caltinay
File length: 20039 byte(s)
Diff to previous 3946
Compiling and installing downunder module now. Adjusted import statements
accordingly. Added a gravity test run.


Revision 3946 - (view) (annotate) - [select for diffs]
Added Wed Aug 22 02:08:12 2012 UTC (7 years, 1 month ago) by caltinay
File length: 19896 byte(s)
Initial import of inversion code from devteam area, rev. 51.
Nothing is scons built/installed/tested yet.


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26