Merge branch 'develop' of github.com:febiosoftware/FEBio into ci/develop

Author: michaelrossherron

FEBioLib/FEBioModel.cpp

@@ -1640,7 +1640,11 @@ bool FEBioModel::Reset()
 	// re-initialize the log file
 	if (m_logLevel != 0)
 	{
-		if (m_log.is_valid()) m_log.close();
+		// TODO: I added this so that log files can be compared using the reset_test
+		// but this messes up the output for optimization problems.
+		// I want the optimization create its own log file, so it is decoupled from the model's
+		// log file. But since all the logging stuff lives in FEBioLib, I can't do this yet.
+//		if (m_log.is_valid()) m_log.close();
 
 		if (InitLogFile() == false) return false;
 	}

FEBioOpt/FEConstrainedLMOptimizeMethod.cpp

@@ -48,12 +48,13 @@ END_FECORE_CLASS();
 //-----------------------------------------------------------------------------
 FEConstrainedLMOptimizeMethod::FEConstrainedLMOptimizeMethod(FEModel* fem) : FEOptimizeMethod(fem)
 {
+	m_pOpt = nullptr;
 	m_tau = 1e-3;
 	m_objtol = 0.001;
 	m_fdiff  = 0.001;
 	m_nmax   = 100;
 	m_scaleParams = false;
-    m_loglevel = LogLevel::LOG_NEVER;
+	m_loglevel = LogLevel::LOG_NEVER;
 }
 
 //-----------------------------------------------------------------------------

FEBioOpt/FEOptimizeMethod.cpp

@@ -28,5 +28,6 @@ SOFTWARE.*/
 
 FEOptimizeMethod::FEOptimizeMethod(FEModel* fem) : FECoreClass(fem)
 { 
-	m_print_level = PRINT_ITERATIONS; 
+	m_loglevel = LogLevel::LOG_NEVER;
+	m_print_level = PRINT_ITERATIONS;
 }