turn off temperature during relax

engine/effectivefield.go

@@ -14,5 +14,7 @@ func SetEffectiveField(dst *data.Slice) {
 	B_exch.AddTo(dst) // ...then add other terms
 	B_anis.AddTo(dst)
 	B_ext.AddTo(dst)
-	B_therm.AddTo(dst)
+	if !relaxing {
+		B_therm.AddTo(dst)
+	}
 }

engine/engine.go

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-const VERSION = "mumax 3.6"
+const VERSION = "mumax 3.6.1"
 
 var UNAME = VERSION + " " + runtime.GOOS + "_" + runtime.GOARCH + " " + runtime.Version() + " (" + runtime.Compiler + ")"
 

engine/relax.go

@@ -11,6 +11,9 @@ func init() {
 	DeclFunc("Relax", Relax, "Try to minimize the total energy")
 }
 
+// are we relaxing?
+var relaxing = false
+
 func Relax() {
 	SanityCheck()
 	pause = false
@@ -20,14 +23,14 @@ func Relax() {
 	prevErr := MaxErr
 	prevFixDt := FixDt
 	prevPrecess := Precess
-	//prevTemp := Temp.upd_reg
 
 	// ...to restore them later
 	defer func() {
 		SetSolver(prevType)
 		MaxErr = prevErr
 		FixDt = prevFixDt
 		Precess = prevPrecess
+		relaxing = false
 		//	Temp.upd_reg = prevTemp
 		//	Temp.invalidate()
 		//	Temp.update()
@@ -37,7 +40,7 @@ func Relax() {
 	SetSolver(BOGAKISHAMPINE)
 	FixDt = 0
 	Precess = false
-	//Temp.Set(0)
+	relaxing = true
 
 	// Minimize energy: take steps as long as energy goes down.
 	// This stops when energy reaches the numerical noise floor.

engine/temperature.go

@@ -111,7 +111,7 @@ func (b *thermField) update() {
 }
 
 func GetThermalEnergy() float64 {
-	if Temp.isZero() {
+	if Temp.isZero() || relaxing {
 		return 0
 	} else {
 		return -cellVolume() * dot(&M_full, &B_therm)