Skip to content
Snippets Groups Projects

Disk patch

Merged Tom Theuns requested to merge disk-patch into master

generates glass-like ICs for a disk-patch (gas in vertical hydrostatic equilibrium with external potential). Runs this disk-patch without assuming gas remains isothermal. See readme.txt

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • 64 gp->a_grav[1] * gp->a_grav[1] +
    65 gp->a_grav[2] * gp->a_grav[2];
    65 /* const float ac2 = gp->a_grav[0] * gp->a_grav[0] + */
    66 /* gp->a_grav[1] * gp->a_grav[1] + */
    67 /* gp->a_grav[2] * gp->a_grav[2]; */
    66 68
    67 const float ac = (ac2 > 0.f) ? sqrtf(ac2) : FLT_MIN;
    69 /* const float ac = (ac2 > 0.f) ? sqrtf(ac2) : FLT_MIN; */
    68 70
    69 const float dt = sqrt(2.f * const_gravity_eta * gp->epsilon / ac);
    71 /* const float dt = sqrt(2.f * const_gravity_eta * gp->epsilon / ac); */
    70 72
    71 return dt;
    73 /* return dt; */
    74 return FLT_MAX;
    72 75 }
  • A few comments on top of the comments on the code above:

    • Is there a way to avoid having this 'legend.pro' file many times in the git ?
    • Could you apply the code formatting script please ?
    • This does not merge cleanly with master. Could you merge the master into your branch and solve the conflicts ?

    Thanks !

  • Matthieu Schaller Added 48 commits:

    Added 48 commits:

  • Added 1 commit:

    • 6102664c - Applied code formatting rule, fixed compilation bug, removed non-free legend.pro files.
  • Added 1 commit:

  • Added 1 commit:

    • fb1c657f - Reverted unnecessary changes in the self-gravity time-step calculation
  • Matthieu Schaller Added 3 commits:

    Added 3 commits:

    • a80b68ca - Cleaner way to handle the iosthermal equation of state constant
    • e2027dfd - Made the potential file compile by removing duplicated lines.
    • f22a6a40 - Improved documentation of the new equation of state.
  • Added 1 commit:

    • f849e58a - Documentation fixes and restored default configuration file.
  • Added 1 commit:

    • f9f00bb4 - Better referencing of sources.
  • Ok. So, I have:

    • made the code actually compile.
    • merged in the latest evolution of the master branch.
    • removed all the debugging code.
    • properly documented the new functions.
    • applied the code style formatting script.

    Please, next time, could you do this before submitting a merge request ?

    I have also removed all occurrences of the legend.pro file. Since it is not open-source and not ours, we cannot have it as part of SWIFT.

    One last question before I merge this in: can we generate ICs without switching on EXTERNAL_POTENTIAL_DISK_PATCH_ICS ? Won't the particles stabilize in a glass configuration even without this ?

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading