Commit Graph

121 Commits

Author SHA1 Message Date
JackHsu
baac7c8d12 Merge branch 'master' into sink_20190723
Conflicts:
	acc/mhd_solver/stencil_defines.h
	src/standalone/simulation.cc
2019-08-08 12:17:28 +08:00
jpekkila
fd94b6321d Renamed globalGrid.n to globalGridN 2019-08-07 18:16:34 +03:00
jpekkila
10200e4dd5 Merge branch 'master' into node_device_interface_revision_07-23 2019-08-07 16:25:33 +03:00
jpekkila
e2f5cced1e Renamed dox -> dot 2019-08-07 16:08:03 +03:00
jpekkila
b61617ee0f Enabled upwinding by default and updated the model helical forcing with the hotfixed changes from earlier commits. Autotests kinda pass (we get 1 failure but this is likely due to inaccuracies of the trigonometric functions used in helical forcing. The error is very close to the acceptable error bound). 2019-08-07 15:53:38 +03:00
Miikka Vaisala
7fdbd76aa2 The default stencil_defines.h setting for merge. 2019-08-07 19:05:14 +08:00
Miikka Vaisala
065f20819f Merge branch 'master' into bugfix/upwind_autotest_20190807 2019-08-07 18:23:03 +08:00
JackHsu
2f14bb2a30 Finished accretion_profile function and started a draft of update_accretion_buffer. 2019-08-07 17:14:26 +08:00
Miikka Vaisala
7e6361a92a Forcing hotfix.
Will need more investigation before scientific runs. Now just something to correct the obvious bug.
2019-08-07 16:04:48 +08:00
Miikka Vaisala
7cc524b78b Adapting for autotest but i, j, k indexing is confusing. 2019-08-07 14:57:51 +08:00
JackHsu
3adec853df made changed to accretion_profile function, still not fully finished but close. 2019-08-07 13:59:12 +08:00
jpekkila
a930864f42 Merge branch 'master' into node_device_interface_revision_07-23 2019-08-07 07:43:28 +03:00
JackHsu
2a26b58c38 Attempted to add accretion_profile function, and made it adjustable within astaroth.conf 2019-08-07 11:21:24 +08:00
Miikka Vaisala
9af5ba2156 Copied elements in the DSL form.
Needs to be adapted at the next stage.
2019-08-07 11:11:27 +08:00
Miikka Vaisala
e199ca196d Merge branch 'master' into sink_20190723 2019-08-07 10:46:23 +08:00
jpekkila
a6fca069a7 Added a comment about helical forcing 2019-08-06 19:47:03 +03:00
jpekkila
d7e26e8f21 Added forcing from stencil_process.sps to autotests. 3 Tests fail. 2019-08-06 19:15:28 +03:00
jpekkila
3726847683 Made globalGridN and d_multigpu_offsets built-in parameters. Note the renaming from globalGrid.n to globalGridN. 2019-08-06 16:39:15 +03:00
JackHsu
aebf4f11ae Added function for truelove-density, and took out the unecessary use of switch on-off module for accretion. 2019-08-06 16:17:11 +08:00
JackHsu
632819764e Some intuitions about accretion process. Also defined as a module. 2019-08-06 11:47:55 +08:00
Miikka Vaisala
1bc07618d6 Added VTXBUF_ACCRETION. 2019-08-05 16:35:26 +08:00
Miikka Vaisala
3c87fe0b48 Added unit_mass 2019-08-02 13:48:09 +08:00
Miikka Vaisala
6927ddff5a Correct an obscure bug. 2019-08-01 17:57:21 +08:00
JackHsu
29d6a9b00a Fixed scaling for sink particle, and added softening factor. 2019-08-01 16:33:58 +08:00
Miikka Vaisala
718a275bcf Proiper softening factor 2019-08-01 14:12:21 +08:00
JackHsu
24a56044f0 Fixed gravitating particle. 2019-07-31 17:07:05 +08:00
JackHsu
5361ee5706 Fixed gravitational force inputs. 2019-07-31 17:07:04 +08:00
JackHsu
34573d7d63 Corrected acciden removal. 2019-07-30 13:32:44 +08:00
JackHsu
a6dcee2381 Forgot to use lengh() instead of dlength_vec(). 2019-07-30 11:50:20 +08:00
JackHsu
0acf52d1b4 Fixed some syntax errors and changed LGRAVITY to LSINK. Will test if this works later. 2019-07-30 11:47:18 +08:00
JackHsu
e7a2734ab6 reparied a delection I did by mistake. 2019-07-29 18:06:57 +08:00
JackHsu
820132cfe9 I attemped to write a complete LSINK module. Haven't tested how it works but just serve as a save point. 2019-07-29 17:53:04 +08:00
JackHsu
d1ca196ccd Added declaration of constants for sink particle. Still in the process of understanding how values are passed, but I've realized how physical equations are defined in stencil_process.sps and in principle I can replicate that for sink particle(which will mostly be gravity). 2019-07-29 13:18:24 +08:00
JackHsu
89e6f8673f Made corrections to some formatting issues. 2019-07-26 16:53:39 +08:00
JackHsu
9d625688ac Apparently my edit this time was unsuccessful, tons of error messeages showed up when I ran "make -j" command in working directory. However this commit is mainly for education purposes, it's so that Miikka (main) and others can see what I changed easily and can use as teaching reference. 2019-07-26 16:22:04 +08:00
jpekkila
f74df5339f Cleaned up the include directory: removed all unnecessary stuff and moved common definitions to a separate file 2019-07-22 19:46:45 +03:00
jpekkila
7abb959828 Overhaul to the user-defined parameters done: All logical switches, parameters and vertex buffer handles are now defined in a single header file (the default location is acc/mhd_solver/stencil_defines.h). This header is used when preprocessing the DSL sources and is linked to the include/ directory when calling scripts/compile_acc.sh. astaroth.h is now used for configuring internal stuff only and should not be modified by users 2019-07-03 19:01:16 +03:00
jpekkila
acc53e1c2b Merged master to acc_parameter_overhaul 2019-07-03 17:37:37 +03:00
jpekkila
81a09501b8 Removed deprecated LNT0 and LNRHO0 defines, now the actual configuration parameters are used (AC_lnrho0 and AC_lnT0). Also accidental autoformatting again, there seems to be stray spaces before linebreaks in some files which get automatically removed by my text editor 2019-07-03 17:23:37 +03:00
Miikka Vaisala
98713ff9d2 A possible bug note added. Will look into late. 2019-07-03 14:49:10 +08:00
Miikka Vaisala
334ff868d9 Forcing disabled from autotest and from defaults.
It is not suitable function of the autotest tool. If there in really a
mandatory need to add it. I will need special help from Johannes.
2019-07-02 18:46:04 +08:00
Miikka Vaisala
4766441ffb Tryin to prepare autotest for forcing. 2019-07-02 18:24:41 +08:00
Miikka Vaisala
03689709df Merge branch 'master' into forcing 2019-07-02 16:43:10 +08:00
jpekkila
d9b07a59b5 Tested with hydro, hydro + magnetic, hydro + magnetic + entropy and hydro + magnetic + entropy + forcing. Autotests passed in all cases. 2019-07-01 19:01:42 +03:00
jpekkila
1e6740f999 Added the equations for hydro only for both CPU and GPU. NOTE: NOT RIGOROUSLY CHECKED FOR CORRECTNESS. I just took the equations used with entropy and removed the terms which included entropy and magnetic fields 2019-07-01 18:56:13 +03:00
jpekkila
21e9fc943b Removed all defines from the stencil assembly and processing files and moved them to the new stencil_defines header. There were spaces after some linebreaks which were removed when I autoformatted the code and that's why there seems to be more changes that there actually is. 2019-07-01 18:40:13 +03:00
jpekkila
b8869bb848 Linked the defines used by the DSL and astaroth.h. Now f.ex. LENTROPY has to be set only once in acc/mhd_solver/stencil_defines.h and it is propagated throughout the whole project. The name for stencil_defines.h is not final and may change if I come up with a better name. In any case, there is now a standard header associated with each DSL solver where the user can set defines, and declare arrays (VTXBUF_LNRHO) and device constants (uniforms). 2019-07-01 18:37:56 +03:00
jpekkila
d9be66f65f NOTE: Renamed LINDUCTION to LMAGNETIC throughout the project. 2019-07-01 13:40:24 +03:00
Miikka Vaisala
0600790f41 Corrected a bug in the timestep and some scaling problems.
Now I can reach a saturated stated in forcing without crashing the code.
2019-07-01 14:19:56 +08:00
Miikka Vaisala
9f0be0d9ff Solved the forcing function boundary problem. 2019-07-01 11:06:42 +08:00