Pull update

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>kotik-coder</groupId>
   <artifactId>PULsE</artifactId>
-  <version>1.95</version>
+  <version>1.97</version>
   <name>PULsE</name>
   <description>Processing Unit for Laser flash Experiments</description>
   <developers>

src/main/java/pulse/math/filters/PolylineOptimiser.java

@@ -87,4 +87,4 @@ public double evaluate(double t) {
         }
     }
 
-}
+}

src/main/java/pulse/math/transforms/StandardTransformations.java

@@ -19,9 +19,6 @@ public class StandardTransformations {
 
         @Override
         public double transform(double a) {
-            if(a < 0) {
-                System.err.println(a);
-            }
             return log(a);
         }
 

src/main/resources/NumericProperty.xml

@@ -21,21 +21,31 @@
 		dimensionfactor="1" discreet="false" keyword="MODEL_WEIGHT"
 		maximum="1" minimum="0" primitive-type="double" value="0">
 	</NumericProperty>
+	<NumericProperty abbreviation="&lt;i&gt;n&lt;/i&gt;"
+		visible="true" descriptor="High-frequency waves (max)"
+		dimensionfactor="1" discreet="false" keyword="MAX_HIGH_FREQ_WAVES"
+		maximum="16" minimum="0" primitive-type="int" value="3">
+	</NumericProperty>
+	<NumericProperty abbreviation="&lt;i&gt;n&lt;/i&gt;"
+		visible="true" descriptor="Low-frequency waves (max)"
+		dimensionfactor="1" discreet="false" keyword="MAX_LOW_FREQ_WAVES"
+		maximum="16" minimum="0" primitive-type="int" value="0">
+	</NumericProperty>
 	<NumericProperty abbreviation="&lt;i&gt;A&lt;/i&gt;"
 		visible="true" descriptor="Baseline amplitude, &lt;i&gt;A&lt;/i&gt;"
 		dimensionfactor="1" discreet="false" keyword="BASELINE_AMPLITUDE"
-		maximum="10" minimum="0" primitive-type="double" value="0.1" default-search-variable="true">
+		maximum="5" minimum="0" primitive-type="double" value="0.1" default-search-variable="false">
 	</NumericProperty>
 	<NumericProperty abbreviation="&amp;phi;" visible="true"
 		descriptor="Baseline phase shift, &amp;phi;" dimensionfactor="1"
-		discreet="false" keyword="BASELINE_PHASE_SHIFT" maximum="6.28"
-		minimum="0" value="0.1" primitive-type="double"
+		discreet="false" keyword="BASELINE_PHASE_SHIFT" maximum="6.28318"
+		minimum="0.0" value="0.1" primitive-type="double"
 		default-search-variable="true">
 	</NumericProperty>
 	<NumericProperty abbreviation="&amp;omega;" visible="true"
 		descriptor="Baseline frequency, &amp;omega; (Hz)" dimensionfactor="1"
-		discreet="false" keyword="BASELINE_FREQUENCY" maximum="300"
-		minimum="1" primitive-type="double" value="50"
+		discreet="false" keyword="BASELINE_FREQUENCY" maximum="20000"
+		minimum="1E-4" primitive-type="double" value="50"
 		default-search-variable="true">
 	</NumericProperty>
 	<NumericProperty abbreviation="&amp;sigma;" visible="true"
@@ -311,7 +321,7 @@
 	<NumericProperty abbreviation="Fixed-point error"
 		visible="false" descriptor="Fixed-point iteration solver error"
 		dimensionfactor="1.0" keyword="NONLINEAR_PRECISION" maximum="1e-2"
-		minimum="1.0E-12" value="1e-8" primitive-type="double"
+		minimum="1.0E-12" value="1e-4" primitive-type="double"
 		discreet="false">
 	</NumericProperty>
 	<NumericProperty abbreviation="&lt;i&gt;N&lt;/i&gt;"
@@ -373,6 +383,20 @@
 		descriptor="Thermal conductivity, &lt;i&gt;&amp;#955;&lt;/i&gt; (W&amp;times;m&lt;sup&gt;-1&lt;/sup&gt;K&lt;sup&gt;-1&lt;/sup&gt;)"
 		dimensionfactor="1.0" keyword="CONDUCTIVITY" maximum="10000.0"
 		minimum="1.0" value="0.0" primitive-type="double" discreet="false"/>
+	<NumericProperty
+		abbreviation="&lt;i&gt;g&lt;/i&gt;"
+		visible="true"
+		descriptor="Energy exchange coefficient (solid), &lt;i&gt;g&lt;/i&gt;"
+		dimensionfactor="1.0" keyword="SOLID_EXCHANGE_COEFFICIENT" maximum = "1000.0"
+		minimum="0.01" value="1.0" primitive-type="double" discreet="false"
+		default-search-variable="true"/>
+	<NumericProperty
+		abbreviation="&lt;i&gt;g&lt;/i&gt;'"
+		visible="true"
+		descriptor="Energy exchange coefficient (gas), &lt;i&gt;g&lt;/i&gt;'"
+		dimensionfactor="1.0" keyword="GAS_EXCHANGE_COEFFICIENT" maximum = "10000.0"
+		minimum="0.01" value="10.0" primitive-type="double" discreet="false"
+		default-search-variable="true"/>
 	<NumericProperty abbreviation="&lt;i&gt;&amp;#949;&lt;/i&gt;"
 		visible="false"
 		descriptor="Hemispherical emissivity, &lt;i&gt;&amp;#949;&lt;/i&gt;"
@@ -440,7 +464,15 @@
 		dimensionfactor="1.0" keyword="BASELINE_INTERCEPT" maximum="20.0"
 		minimum="-20.0" value="0.0" primitive-type="double" discreet="false"
 		default-search-variable="false" />
-       	<NumericProperty 
+	<NumericProperty 
+                abbreviation="Bi&lt;sub&gt;g&lt;/sub&gt;"
+		visible="true"
+		descriptor="Heat losses (gas), Bi&lt;sub&gt;g&lt;/sub&gt;"
+		dimensionfactor="1.0" keyword="HEAT_LOSS_GAS" maximum="100.0"
+		minimum="0.0" value="0.2" primitive-type="double" discreet="false"
+		default-search-variable="true">
+        </NumericProperty>
+	<NumericProperty 
                 abbreviation="Bi (combined)"
 		visible="false"
 		descriptor="Heat losses (combined), Bi"

src/main/resources/Version.txt

@@ -1 +1 @@
-1.95
+1.97

src/main/resources/messages.properties

@@ -49,6 +49,7 @@ DiathermicProblem.Descriptor=<html><b>Diathermic Sample with Grey Walls (1D)</b>
 LinearizedProblem2D.Descriptor=<html><b>Classical 2D</b> Problem Statement<ul style='list-style-type:none'><li>Based on 1D formulation, except:</li><li>Allows heat losses from side surface<li>Allows radial heat flow</li></ul></html>
 UniformlyCoatedSample.Descriptor=<html><b>Core-Shell 2D</b> Problem Statement<ul style='list-style-type:none'><li>Based on the classical 2D problem, except:</li><li>Explicitly accounts for a coating that covers front, rear, and side surfaces</li>Allows for axial, radial, and circumferential heat fluxes</li></ul></html>
 NonlinearProblem.Descriptor=<html><b>Nonlinear Heat Sink (1D)</b> Problem Statement<ul style='list-style-type:none'><li>Precise calculation of heat losses (front and rear only)<li><i>C<sub>p</sub></i> and <i>&rho;</i> data required</li></ul></html>
+TwoTemperatureModel.Descriptor=<html><b>Two-Temperature Penetration Model (1D)</b> Problem Statement<ul style='list-style-type:none'><li>Different temperatures for solid and gas phase</li><li>Energy exchange between phases</li><li>Extended light penetration</li><li><i>C<sub>p</sub></i> and <i>&rho;</i> data required</li></ul></html>
 Problem.6=Laser Pulse
 Problem.7=Heating Curve
 DATReader.0=dat
@@ -289,4 +290,5 @@ MixedScheme2.4=<html><b>Increased Accuracy Semi-implicit Scheme</b><ul style='li
 MixedScheme2.5=<html><b>Increased Accuracy Semi-implicit Scheme (NL)</b><ul style='list-style-type:none'><li>Order of approximation <i>O</i>(<i>h</i><sup>4</sup> + <i>&tau</i><sup>2</sup>)</li><li>Unconditionally stable</li><li>Steps are computationally more expensive but their number is fewer compared to other schemes</li><li>Heat equation and BC are linear while RTE has a nonlinear emission term processed with a fixed iteration algorithm</li></ul></html>
 TextWrap.0=<html><body><p style='width: 300px;'>
 TextWrap.1=</p></body></html>
-TextWrap.2=<html><body><p style='width: 185px;'>
+TextWrap.2=<html><body><p style='width: 185px;'>
+msg.running=An instance of PULsE appears to be running. Please switch back to the running version or delete the pulse.lock file found in the PULsE directory.