Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

may 15 added matlab free directory spectra generator #23

Open
wants to merge 109 commits into
base: move_mesh_surface_only
Choose a base branch
from
Open

may 15 added matlab free directory spectra generator #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
e10ba12
Merge pull request #10 from AntonErmakov/origin
elstargazer Nov 21, 2015
0c0bae9
Merge pull request #14 from elstargazer/move_mesh_surface_only
elstargazer Dec 2, 2015
286d4f7
Merge branches 'origin' and 'master' of https://github.com/elstargaze…
elstargazer Dec 2, 2015
2e0cba7
permit fitting of surfaces not at outer boundary
elstargazer Dec 2, 2015
150e119
Merge pull request #15 from elstargazer/fit_ellipse_edited
elstargazer Dec 2, 2015
9a9a1a4
Merge pull request #4 from elstargazer/fit_ellipse_edited
AntonErmakov Dec 2, 2015
3e26eca
added write mesh
AntonErmakov Dec 2, 2015
54ff543
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov Dec 2, 2015
63324d4
got rid of h
AntonErmakov Dec 2, 2015
5c0d6cb
Merge pull request #16 from AntonErmakov/master
elstargazer Dec 2, 2015
8d139f0
added matlab support files
AntonErmakov Dec 2, 2015
5803567
Merge pull request #17 from AntonErmakov/master
elstargazer Dec 2, 2015
7461d10
core is always oblate
AntonErmakov Dec 3, 2015
7be900f
added comments on spherical core
AntonErmakov Dec 4, 2015
b1afe09
ephemeral changes for runs
elstargazer Dec 6, 2015
a8c84c1
Merge pull request #18 from AntonErmakov/master
elstargazer Dec 6, 2015
6227b79
Merge branch 'master' of https://github.com/elstargazer/ceres
elstargazer Dec 6, 2015
d79d96f
added ellipse_fits.txt output file
elstargazer Dec 6, 2015
0915ee8
ephemeral run changes
elstargazer Dec 7, 2015
96c4ec4
added hydrostatic shape generation plus power spectrum nonhydro shape
AntonErmakov Dec 10, 2015
cae445d
juck
elstargazer Dec 11, 2015
5e80fdd
commiting very minor changes before plasticity debugging
elstargazer Jan 17, 2016
4d35c2a
added Schultz plasticity, latitude dependence, manual surface layer r…
elstargazer Jan 31, 2016
eda530e
added random core topo
AntonErmakov Jan 31, 2016
944ef36
fixed bug with loading effective viscosities in the stress calculations
elstargazer Jan 31, 2016
7351f4f
added new variables
AntonErmakov Feb 19, 2016
a02170a
added new plast crit
AntonErmakov Feb 19, 2016
267f201
changed outfolder
AntonErmakov Feb 19, 2016
0331ffb
chnaged number of meshes
AntonErmakov Feb 19, 2016
f79d800
forced deg 2 and 4
AntonErmakov Feb 19, 2016
d750708
changed folder str
AntonErmakov Feb 19, 2016
2728fb2
changed folder str
AntonErmakov Feb 19, 2016
89fb9ac
added core shape
AntonErmakov Feb 19, 2016
7d1a1f6
added folder str
AntonErmakov Feb 19, 2016
484c35d
added folder str"
AntonErmakov Feb 19, 2016
588261a
added runname
AntonErmakov Feb 19, 2016
106b85a
added
AntonErmakov Feb 21, 2016
df2a077
added read output
AntonErmakov Feb 21, 2016
c2abf18
now it works
AntonErmakov Feb 21, 2016
7ede317
added special folder structure
AntonErmakov Feb 22, 2016
ac46975
fixed bigs in folder structure
AntonErmakov Feb 22, 2016
f4355eb
added spectral calc from spectra files and calc of relax times
AntonErmakov Feb 25, 2016
0571c62
got rid of figures
AntonErmakov Feb 25, 2016
1b76f46
added errorbars
AntonErmakov Mar 1, 2016
57cb29d
added plotting inividual fits
AntonErmakov Mar 1, 2016
beb7ca5
optimized a little the mesh layers
AntonErmakov Apr 10, 2016
6dded38
add J2 fp calc
AntonErmakov Apr 12, 2016
c12acf9
Merge branch 'master' of https://github.com/elstargazer/ceres
AntonErmakov Apr 12, 2016
f15dfb4
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov Apr 12, 2016
0c9fea2
changed output folder name
AntonErmakov Apr 13, 2016
3545560
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov Apr 13, 2016
707c952
new format, got rig of old stuff
AntonErmakov Apr 14, 2016
6b1516e
changed mesh file name
AntonErmakov Apr 14, 2016
a8a47e9
got rig of errors, new mesh file names
AntonErmakov Apr 14, 2016
864c5ae
added tic toc
AntonErmakov Apr 14, 2016
9ba4e40
addded progressbar, changed l = 100
AntonErmakov Apr 14, 2016
954a032
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov Apr 14, 2016
34d382c
added mesh file paths
AntonErmakov Apr 14, 2016
b8d79a0
got rid of lines
AntonErmakov Apr 14, 2016
219672a
commit before adding rotation
elstargazer Dec 11, 2015
71f7f71
synching with antons repo after Antarctica
elstargazer Apr 12, 2016
4342b55
untracked config and runlist files and meshes
elstargazer Apr 18, 2016
c5a9e94
untracked config and runlist files and meshes
elstargazer Apr 18, 2016
14d91ba
changed cfg file max length, total fails to 120, added write vert (1)…
AntonErmakov May 1, 2016
70df5f3
added moreprocessing of expception and added printing cfg file name
AntonErmakov May 1, 2016
16a82c2
changed folder struc
AntonErmakov May 1, 2016
9402270
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov May 1, 2016
80953f9
now it can take an initial spectrum from a file
AntonErmakov May 4, 2016
6deb09d
added initial non hydro spectrum
AntonErmakov May 4, 2016
01cc48a
initial commit
AntonErmakov May 4, 2016
8c24287
added timing
AntonErmakov May 4, 2016
c0de467
changed cfg file max length, total fails to 120, added write vert (1)…
AntonErmakov May 1, 2016
af4adb5
added moreprocessing of expception and added printing cfg file name
AntonErmakov May 1, 2016
4fd8160
now it can take an initial spectrum from a file
AntonErmakov May 4, 2016
79deea5
commit before adding rotation
elstargazer Dec 11, 2015
98d802f
added matlab script for making spectra where you specify the directory
elstargazer May 15, 2016
8939d2e
copy anton's current code
elstargazer May 15, 2016
507116c
added matlab script to compute spectra in user spec folder
elstargazer May 15, 2016
3bc229a
manually synched ceres.cc
elstargazer May 15, 2016
bcf0c08
manually synched ceres.cc
elstargazer May 15, 2016
7cca745
reorganized output; fixed issue with not printing elastic displaced step
elstargazer May 16, 2016
ff90898
fixed issue with offset plasticity steps in the physical_times.txt file
elstargazer May 21, 2016
a7e3652
added powerlawmeshlisttest
AntonErmakov Jun 11, 2016
9195d7a
commented out separate spectral folder
AntonErmakov Jun 21, 2016
4c9a223
put check for area<0 cell in ceres.cc; now can run in optimized
elstargazer Jun 26, 2016
54da4ab
no changes
AntonErmakov Jun 26, 2016
a89eb3b
Merge branch 'master' of https://github.com/elstargazer/ceres
AntonErmakov Jun 26, 2016
6d3874e
Merge branch 'master' of https://github.com/AntonErmakov/FE
AntonErmakov Jun 26, 2016
3aa5467
added physical_times.txt entry for last step in case of interruption
elstargazer Jun 27, 2016
63cd2d0
Merge branch 'master' of https://github.com/elstargazer/ceres
AntonErmakov Jun 27, 2016
d1394f8
now using elastic steps to find time and then uses constant timesteps
elstargazer Jun 29, 2016
d5264e7
Merge branch 'master' of https://github.com/elstargazer/ceres
AntonErmakov Jun 29, 2016
dca274a
made time fixed and deleted extra factor of 2 in eta_VE
elstargazer Jul 5, 2016
6acbd06
fix issue with plasticity calculation using viscoelastic stress; dele…
elstargazer Jul 13, 2016
def53a6
Merge branch 'master' of https://github.com/elstargazer/ceres
AntonErmakov Jul 13, 2016
84d4e9a
added layers resolution control
AntonErmakov Aug 20, 2016
d995481
added cell height
AntonErmakov Aug 20, 2016
bb2f9c4
added spectrum file
AntonErmakov Aug 20, 2016
aa9c670
changed input file name
AntonErmakov May 9, 2017
f0dd883
added single degree capability
AntonErmakov May 9, 2017
65be4f9
added comments
AntonErmakov May 9, 2017
39e998e
added internal boundary output and added number of step digits to be …
AntonErmakov May 9, 2017
a3a2c2a
added spectra
AntonErmakov May 9, 2017
e5dd3d8
added single degree psd function
AntonErmakov May 9, 2017
d785286
added relaxation movie test
AntonErmakov May 9, 2017
adcc7c7
added mathematica files
AntonErmakov May 9, 2017
3dc982e
added isostatic evo
AntonErmakov May 9, 2017
954c507
added moho spectrum
AntonErmakov May 9, 2017
d4cb86d
last version before merging with moho fitted code
elstargazer May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 0 additions & 89 deletions config/ConfigurationFile.cfg
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions config/ConfigurationMatlab.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
spherical_mesh_filename = "../meshes/mesh_sph.inp";
shape_folder = "/Users/antonermakov/Dawn/CeresShapeModel/SPC/CERES_SURVEY_150716_GRAVITY_SPC/";
shape_filename = "SHAPE_SPC150716_256.bds";
figure_folder = "~/Dawn/Figures/"
figure_spetrum_filename = "Fig_RelaxedCeresSpectrum.jpg";
FE_folder = "~/Desktop/ceres/ceres_code/";
figure_folder = "~/Dawn/Figures/";



84 changes: 0 additions & 84 deletions config/ConfigurationTemplate.cfg
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions config/ConfigurationV2.cfg
View file
Open in desktop

This file was deleted.

Loading