Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SPINS_main
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

31978d73

Commit 31978d73 authored 3 years ago by Christopher Subich

Downloads
- Plain Diff

Merge branch 'master' of git.uwaterloo.ca:ncastrof/SPINS_main

Resolved merge conflicts in Science.hpp, derivatves.cpp, incremented
VERSION by one further patchlevel

parents d63d8368 e4bf9871

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/Science.hpp 7 additions, 4 deletions

src/Science.hpp
src/Science/compute_lambda2.cpp 161 additions, 0 deletions

src/Science/compute_lambda2.cpp
src/VERSION 1 addition, 1 deletion

src/VERSION
src/cases/derivatives/derivatives.cpp 37 additions, 4 deletions

src/cases/derivatives/derivatives.cpp
src/cases/derivatives/spins.conf 2 additions, 1 deletion

src/cases/derivatives/spins.conf

with 208 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment