Context Navigation

Changeset 13095 for branches/dev-mj-1626/RuntimeLibrary/src

Timestamp:

Jul 9, 2019 3:08:30 PM (5 months ago)

Author:

tgutzmann

Message:

Merge from trunk

Location:

branches/dev-mj-1626

Files:

Property svn:externals

-                      old
+                      new
 https://svn.jmodelica.org/assimulo/tags/Assimulo-3.0@875 external/Assimulo
 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5/src/common@12158 Python/src/common
+https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.3/src/common@13067 Python/src/common
 https://github.com/chria/casadi/branches/tested_mod@11366 ThirdParty/CasADi/CasADi
 https://svn.jmodelica.org/FMILibrary/trunk@10948 external/FMILibrary/FMILibrary
 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.1@12984 external/PyFMI
+https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.3@13069 external/PyFMI

Property svn:mergeinfo changed

/branches/dev-1663 (added)	merged: 12546,12548,12559-12560,12572,12578,12585,12589,12632,12638,12649,12794,12815-12816,12818,12867,12887,12896,12932,12989,12993,13005,13008,13010-13012,13014,13016
/branches/dev-AR-logoutput (added)	merged: 13024
/trunk	merged: 13017,13019,13035,13044,13053,13060,13063,13074-13078	reverse-merged: 12980-12982

branches/dev-mj-1626/RuntimeLibrary/src
- Property svn:mergeinfo changed
  /branches/dev-AR-logoutput/RuntimeLibrary/src (added) merged: 13024
  /trunk/RuntimeLibrary/src merged: 13053

r10867	r13095
121	121	}
122	122	if(log_level >= 3) {
123		jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"ivs":"inputs", inputs, n);
	123	jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"illegal_ivs":"inputs", inputs, n);
124	124
125	125	}
…	…
197	197	}
198	198	if(log_level >= 3) {
199		jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"ivs":"inputs", inputs, n_inputs);
200		jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"residuals":"outputs", outputs, n_outputs);
	199	jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"illegal_ivs":"inputs", inputs, n_inputs);
	200	jmi_log_reals(log, outer, logWarning, is_iter_var_flag?"illegal_residuals":"outputs", outputs, n_outputs);
201	201
202	202	}

Note: See TracChangeset for help on using the changeset viewer.

/branches/dev-AR-logoutput/RuntimeLibrary/src (added)	merged: 13024
/trunk/RuntimeLibrary/src	merged: 13053