LemmaSoftware
/
Merlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity

Commit Graph

  • *
  • |\
  • * |
  • | *
  • |/
  • *
  • |\
  • * |
  • * |
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * |
  • | *
  • | *
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * |
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * |
  • | *
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * |
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • 89a10c6 (HEAD, master) Merge branch 'master' of https://lemma.codes/LemmaSoftware/merlin by Trevor Irons 2021-05-14 16:26:16 -0600
  • 85d7200 Opalstack -> GitHub sync test by Trevor Irons 2021-05-14 16:22:05 -0600
  • 2f1e5ed GitHub hook test by Trevor Irons 2021-05-14 14:43:09 -0600
  • 43d5c73 Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master by Trevor Irons 2020-09-12 09:33:34 -0600
  • 11585c0 VTK 9 support by Trevor Irons 2020-09-12 09:32:57 -0600
  • d06a694 Removal of Boost progress bar by Trevor Irons 2019-12-04 22:55:36 -0700
  • 386bfa8 CXX 14 standard forced by Trevor Irons 2019-10-22 10:35:41 -0600
  • cfc3243 Python binder fix for reading in files by Trevor Irons 2019-10-11 08:24:19 -0600
  • 2266d68 update of progress bar for kernel by Trevor Irons 2019-09-10 21:05:51 -0600
  • 5531ffa version bump by Trevor Irons 2019-09-05 17:01:32 -0600
  • d6b6ac3 Working wrapper for kernel class in python by Trevor Irons 2019-08-28 22:30:24 -0600
  • f29523a Beginning of python wrapper for Merlin by Trevor Irons 2019-08-28 17:08:00 -0600
  • 16e0ca5 VTK support readded for kernel calculation by Trevor Irons 2019-02-27 13:08:48 -0700
  • afb6bb6 Progress towards vtkHyperTreeGrid support by Trevor Irons 2019-02-26 17:08:49 -0700
  • 0d25529 Updates for better integration with Akvo by Trevor Irons 2018-11-26 17:51:04 -0700
  • c9d9d03 Merge branch 'master' of https://git.lemmasoftware.org/Merlin by T-bone 2018-01-09 23:27:11 -0700
  • bf51a01 updated for Lemma 0.2.0 by T-bone 2018-01-09 23:19:53 -0700
  • 7782c85 reworking Lemma connections by Trevor Irons 2018-01-09 16:47:49 -0700
  • fd515bd config fix by Trevor Irons 2018-01-04 16:27:26 -0700
  • e844175 Update README.md by Trevor Irons 2018-01-02 07:26:34 -0700
  • 11b1b69 Added README.md and test mirror push to GitHub. by T-bone 2017-12-30 09:19:43 -0700
  • 0890be3 Added license file and test mirror push to GitHub. by T-bone 2017-12-30 09:16:57 -0700
  • 120d2c1 kernel calc tweaks by Trevor Irons 2017-12-14 11:25:19 -0700
  • 6d0b598 Modifications for inversion by T-bone 2017-12-04 08:50:32 -0700
  • d2072d1 Forward modelling of FID data is possible, but final format of files not nailed down. by T-bone 2017-08-30 12:08:53 +0000
  • 08046dd LayeredEarthEM mocked up and looking good. by T-bone 2017-08-30 02:34:51 +0000
  • b14d9a6 Better parsing of MatrixXR by Trevor Irons 2017-08-29 10:01:34 -0600
  • 7949026 Work towards full forward modelling support by T-bone 2017-08-29 12:22:51 +0000
  • 65b348c Model class added for forward modelling as well. by Trevor Irons 2017-08-28 16:29:05 -0600
  • c9bfe60 Addition of base class for Merlin, for keeping track of versioning in serialized classes. by Trevor Irons 2017-08-28 13:55:50 -0600
  • 7ea0dbf Addition of data and forward modeling classes, not yet completed by Trevor Irons 2017-08-28 13:55:18 -0600
  • 95bbad6 Merge branch 'master' of https://git.lemmasoftware.org/Merlin by Trevor Irons 2017-08-24 12:20:54 -0600
  • 62cd549 Fix example kernel calculation application for better warning with unsufficient arguments. by Trevor Irons 2017-08-24 12:20:07 -0600
  • 51634bd Kernel calculation can now align with Akvo data from the YAML. by Trevor Irons 2017-05-30 14:32:52 -0600
  • 7d457f0 VTK output in kernel calulation as an option by Trevor Irons 2017-04-25 12:47:27 -0600
  • 737ce9b File name fix in example prog. by T-bone 2017-04-09 01:26:47 +0000
  • cdef920 Clean up of IO and cout by T-bone 2017-04-09 01:20:08 +0000
  • 2067f79 Added serialization of KernelV0 encompasing all input parameters. No need to compile to change settings. by T-bone 2017-04-09 01:06:54 +0000
  • 9fac322 Underflow in beta calculation of elliptic field. Only ocurred with small loops. Now falls back to 0. by T-bone 2017-04-08 22:16:15 +0000
  • 56bca80 Cleaning up kernel file by Trevor Irons 2017-04-06 06:50:04 -0600
  • 3f023f5 More work on kernel calculation checking. Improved VTK file output by Trevor Irons 2017-04-04 17:02:40 -0600
  • a626f6c Adding more info into VTK files in kernel calculation. by T-bone 2017-04-04 21:17:43 +0000
  • e28eeec Fixes elliptic field calculation bug by T-bone 2017-04-02 23:21:38 +0000
  • 98f9409 Better file naming by T-bone 2017-03-31 19:36:31 +0000
  • 6813e85 merge by T-bone 2017-03-30 10:40:25 +0000
  • 784f30d Ternary array modifications by T-bone 2017-03-30 10:34:16 +0000
  • 241215b Added second Kernel generating example program taking yaml input files, will replace older one eventually by Trevor Irons 2017-03-29 16:30:50 -0600
  • 5739971 Added mechanism to align kernels with akvo data by Trevor Irons 2017-01-31 16:30:20 -0700
  • d294baa Fix in phase term of coils! by T-bone 2016-12-08 14:23:06 +0000
  • 8fd8ae4 added specialized 3 loop kernel calculator by Trevor Irons 2016-12-06 12:29:25 -0700
  • e4d6a68 Added a templated class for coil interferences by Trevor Irons 2016-12-02 17:05:07 -0700
  • 5bfd336 params fixed for mkass by Trevor Irons 2016-12-01 17:01:03 -0700
  • ad7c692 Fixed coupling back to coupling rather than phase angle by Trevor Irons 2016-12-01 16:54:04 -0700
  • a16596c Merge branch 'master' of https://git.lemmasoftware.org/Merlin by Trevor Irons 2016-12-01 14:38:31 -0700
  • 4ae1cdb Coupling and image generation plots by Trevor Irons 2016-12-01 14:38:01 -0700
  • ec83617 Fixes in logic for splitting at min and max level for better readability (clang warning) by tirons 2016-12-01 13:50:50 -0700
  • fc005c1 coupling fixes by T-bone 2016-11-29 14:45:48 +0000
  • 774a560 Few changes to coupling code by Trevor Irons 2016-11-28 16:40:37 -0700
  • 7dba245 Added coupling routine by T-bone 2016-11-28 21:57:37 +0000
  • 017dbd5 working on file output a bit by T-bone 2016-11-23 14:28:06 +0000
  • 6e5f0f3 kernel plotting and working on spacing bug, may have just been an illusion. by Trevor Irons 2016-11-22 12:28:24 -0700
  • 9dc6e0e Added plotting utilities for viewing kernels by T-bone 2016-11-22 21:55:58 +0000
  • a3d5b02 looking at weird bug in log spaced depth and kernel transpose? by T-bone 2016-11-22 21:48:28 +0000
  • 974598a log spacing, but seems to reverse kernel in plots? Strange. by T-bone 2016-11-22 13:51:35 +0000
  • 0c5bbd8 Working with all at once kernel calculation. Much faster. by T-bone 2016-11-22 12:16:52 +0000
  • 95100ed All q at once kernel evaluation for speedup, don't repeat EMEarth1D calcualtions for each moment. by Trevor Irons 2016-11-21 17:06:27 -0700
  • 53d70af Cleaning up kernel calculatio by Trevor Irons 2016-11-21 00:48:45 -0700
  • 579467b Tweaks to integration routine, simplier now by Trevor Irons 2016-11-21 00:11:14 -0700
  • 1d91df0 format change with kernel pring by Trevor Irons 2016-11-16 17:17:18 -0700
  • 79e743c Kernel calculation seems to be working. by Trevor Irons 2016-11-16 15:58:49 -0700
  • 68b1082 Working on kernel matrix calculation by Trevor Irons 2016-11-16 11:25:38 -0700
  • 602750c Multiple coils are supported, preliminary nmr modeling added, but not yet verified. by T-bone 2016-11-15 14:08:47 +0000
  • 2da9663 Imporovements still coming to kernel calculation by Trevor Irons 2016-11-14 17:05:43 -0700
  • 25f3797 Fixed positioning bug in octree. Looks good now. by Trevor Irons 2016-11-14 13:59:25 -0700
  • 097ea89 More progress, octree grids are working, as are EM calculations on them. Need to add logic for kernel caluclation for a prism, and then depth layers. by T-bone 2016-11-14 14:53:43 +0000
  • 777faf6 Added integration on octree grid, independent of VTK, for faster performance. Need to add optional VTK method for visualization. by T-bone 2016-11-14 00:55:51 +0000
  • d92d993 Work towards new Merlin by T-bone 2016-11-12 11:26:36 +0000
  • 507ae71 Merlin 2.0 has been started conforming with changes to Lemma. Leaner, meaner and more elegant. Kernel calculations are up first. by Trevor Irons 2016-11-11 16:31:00 -0700