MERRILL (Micromagnetic Earth Related Robust Interpreted Language Laboratory) is an open source 3D micromagnetics software package with a simple scripting user interface for modelling complex, inhomogeneous domain structures in magnetic materials.
MERRILL uses a finite-element/boundary-element approach well suited to irregular grain geometries of interest to the rock and palaeomagnetic community, and can simulate magnetic characteristics of both single grains and small assemblies of interacting grains. The open source nature of the code encourages future development by the scientific community.
uvicorn app.main:app --reloadThen open http://localhost:8000 in your browser.
- Added shared layout in
base.htmlwith navigation, header band, and footer. - Moved styles and scripts into
app/static/css/main.cssandapp/static/js/main.js. - Created
home.htmlwith an overview of MERRILL and links to key sections. - Added Tutorials section (
tutorials.html) and Tutorial 1 page (tutorial_1.html) with embedded video. - Registered
tutorial_1_controller.pyin the FastAPI application.
Basic rule: work in small steps and sync often.
git pull origin main
git statusThis makes sure you have the latest changes before editing.
- Make small, logical changes that keep the code running.
- When a small piece is done (e.g. new page, layout tweak, bug fix):
git status # see what changed
git add <files you changed>
git commit -m "Short description of this change"Examples:
git commit -m "Add Tutorial 1 page and controller"git commit -m "Improve base layout and move CSS to static file"
Push after one or three commits or whenever you stop working:
git push origin maingit status # should say 'working tree clean'
git push origin mainThis keeps Bitbucket up to date so another machine (or collaborator) can safely run git pull origin main next time.