Skip to content

Commit

Permalink
Updated readme.md, added Spectrem example, and updated documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
rcb547 committed Jun 5, 2016
1 parent 62705c8 commit f31d197
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
- Language: mostly C++, some matlab, some python

## Releases
### Release-20160603
- Added Python 3 interface for simple forward modelling and derivatives only.
### Release-20160606
- Added Python 3.x interface for simple forward modelling and derivatives only.
- Added Matlab interface for simple forward modelling and derivatives only.
- Changed how the PPM normalisation is carried out. Now PPM normalisation is by directional-component-wise with respect to the maximum primary dB/dt or B-field at the receiver for a reference system geometry (which is usually estimated on a per flight or per survey basis). Previously PPM normalisation was with respect to the system geometry for the forward model being run.
- Added GEOTEM (1996 ppm system) and SPECTREM (ppm system) examples.
Expand Down
Binary file modified docs/GA AEM Programs User Manual.pdf
Binary file not shown.
21 changes: 21 additions & 0 deletions examples/spectrem/gaforwardmodeltdem/input_model.hdr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Column Label Description and Units
1 tx_height TX height above ground m
2 tx_roll TX roll degrees, left wing up is +ve
3 tx_pitch TX pitch degrees, nose down is +ve
4 tx_yaw TX yaw degrees degrees, turn left is +ve
5 txrx_dx TX-RX inline separation m, RX in front of TX +ve
6 txrx_dy TX-RX transverse separation m, RX left of TX +ve
7 txrx_dz TX-RX vertical separation m, RX above TX is +ve
8 rx_roll RX roll degrees degrees, left wing up is +ve
9 rx_pitch RX pitch degrees degrees, nose down is +ve
10 rx_yaw RX yaw degrees degrees, turn left is +ve
11 N number of layers
12 cond:1 layer 1 conductivity S/m
13 cond:2 layer 2 conductivity S/m
...
12+N-1 cond:N layer N conductivity S/m
12+N thickness:1 layer 1 thickness m
12+N+1 thickness:2 layer 2 thickness m
...
12+2N-1 thickness:N-1 layer N-1 thickness m

3 changes: 3 additions & 0 deletions examples/spectrem/gaforwardmodeltdem/input_model_spectrem.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
90 0 0 0 -123 0 -36 0 0 0 1 0.100
90 0 0 0 -123 0 -36 0 0 0 2 0.200 0.001 20
90 0 0 0 -123 0 -36 0 0 0 3 0.010 0.200 0.001 20 20
10 changes: 10 additions & 0 deletions examples/spectrem/gaforwardmodeltdem/run.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
echo off

REM Add executable and FFTW directories to yo search path
REM (Ideally you would add these to your PATH environment variable)
set path=..\..\..\bin\x64\Release\;%path%
set path=..\..\..\third_party\fftw3.2.2.dlls\64bit;%path%

gaforwardmodeltdem.exe spectrem.con

pause
4 changes: 4 additions & 0 deletions examples/spectrem/gaforwardmodeltdem/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/tcsh

gaforwardmodeltdem.exe spectrem.con

6 changes: 6 additions & 0 deletions examples/spectrem/gaforwardmodeltdem/spectrem.con
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Control Begin
SystemFile = ../stmfiles/Spectrem-ppm.stm
InputModelFile = input_model_spectrem.txt
OutputDataFile = output_spectrem.asc
OutputDataHeader = output_spectrem.hdr
Control End

0 comments on commit f31d197

Please sign in to comment.