Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8da53f2

Browse filesBrowse files
kotik-coderkotik-coder
committed
Pull update
1 parent ca2f894 commit 8da53f2
Copy full SHA for 8da53f2

File tree

Expand file treeCollapse file tree

7 files changed

+1069
-14
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+1069
-14
lines changed

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>kotik-coder</groupId>
55
<artifactId>PULsE</artifactId>
6-
<version>1.95</version>
6+
<version>1.97</version>
77
<name>PULsE</name>
88
<description>Processing Unit for Laser flash Experiments</description>
99
<developers>

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

Copy file name to clipboardExpand all lines: src/main/java/pulse/math/filters/PolylineOptimiser.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ public double evaluate(double t) {
8787
}
8888
}
8989

90-
}
90+
}

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

Copy file name to clipboardExpand all lines: src/main/java/pulse/math/transforms/StandardTransformations.java
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ public class StandardTransformations {
1919

2020
@Override
2121
public double transform(double a) {
22-
if(a < 0) {
23-
System.err.println(a);
24-
}
2522
return log(a);
2623
}
2724

‎src/main/resources/NumericProperty.xml

Copy file name to clipboardExpand all lines: src/main/resources/NumericProperty.xml
+39-7Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,31 @@
2121
dimensionfactor="1" discreet="false" keyword="MODEL_WEIGHT"
2222
maximum="1" minimum="0" primitive-type="double" value="0">
2323
</NumericProperty>
24+
<NumericProperty abbreviation="&lt;i&gt;n&lt;/i&gt;"
25+
visible="true" descriptor="High-frequency waves (max)"
26+
dimensionfactor="1" discreet="false" keyword="MAX_HIGH_FREQ_WAVES"
27+
maximum="16" minimum="0" primitive-type="int" value="3">
28+
</NumericProperty>
29+
<NumericProperty abbreviation="&lt;i&gt;n&lt;/i&gt;"
30+
visible="true" descriptor="Low-frequency waves (max)"
31+
dimensionfactor="1" discreet="false" keyword="MAX_LOW_FREQ_WAVES"
32+
maximum="16" minimum="0" primitive-type="int" value="0">
33+
</NumericProperty>
2434
<NumericProperty abbreviation="&lt;i&gt;A&lt;/i&gt;"
2535
visible="true" descriptor="Baseline amplitude, &lt;i&gt;A&lt;/i&gt;"
2636
dimensionfactor="1" discreet="false" keyword="BASELINE_AMPLITUDE"
27-
maximum="10" minimum="0" primitive-type="double" value="0.1" default-search-variable="true">
37+
maximum="5" minimum="0" primitive-type="double" value="0.1" default-search-variable="false">
2838
</NumericProperty>
2939
<NumericProperty abbreviation="&amp;phi;" visible="true"
3040
descriptor="Baseline phase shift, &amp;phi;" dimensionfactor="1"
31-
discreet="false" keyword="BASELINE_PHASE_SHIFT" maximum="6.28"
32-
minimum="0" value="0.1" primitive-type="double"
41+
discreet="false" keyword="BASELINE_PHASE_SHIFT" maximum="6.28318"
42+
minimum="0.0" value="0.1" primitive-type="double"
3343
default-search-variable="true">
3444
</NumericProperty>
3545
<NumericProperty abbreviation="&amp;omega;" visible="true"
3646
descriptor="Baseline frequency, &amp;omega; (Hz)" dimensionfactor="1"
37-
discreet="false" keyword="BASELINE_FREQUENCY" maximum="300"
38-
minimum="1" primitive-type="double" value="50"
47+
discreet="false" keyword="BASELINE_FREQUENCY" maximum="20000"
48+
minimum="1E-4" primitive-type="double" value="50"
3949
default-search-variable="true">
4050
</NumericProperty>
4151
<NumericProperty abbreviation="&amp;sigma;" visible="true"
@@ -311,7 +321,7 @@
311321
<NumericProperty abbreviation="Fixed-point error"
312322
visible="false" descriptor="Fixed-point iteration solver error"
313323
dimensionfactor="1.0" keyword="NONLINEAR_PRECISION" maximum="1e-2"
314-
minimum="1.0E-12" value="1e-8" primitive-type="double"
324+
minimum="1.0E-12" value="1e-4" primitive-type="double"
315325
discreet="false">
316326
</NumericProperty>
317327
<NumericProperty abbreviation="&lt;i&gt;N&lt;/i&gt;"
@@ -373,6 +383,20 @@
373383
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;)"
374384
dimensionfactor="1.0" keyword="CONDUCTIVITY" maximum="10000.0"
375385
minimum="1.0" value="0.0" primitive-type="double" discreet="false"/>
386+
<NumericProperty
387+
abbreviation="&lt;i&gt;g&lt;/i&gt;"
388+
visible="true"
389+
descriptor="Energy exchange coefficient (solid), &lt;i&gt;g&lt;/i&gt;"
390+
dimensionfactor="1.0" keyword="SOLID_EXCHANGE_COEFFICIENT" maximum = "1000.0"
391+
minimum="0.01" value="1.0" primitive-type="double" discreet="false"
392+
default-search-variable="true"/>
393+
<NumericProperty
394+
abbreviation="&lt;i&gt;g&lt;/i&gt;'"
395+
visible="true"
396+
descriptor="Energy exchange coefficient (gas), &lt;i&gt;g&lt;/i&gt;'"
397+
dimensionfactor="1.0" keyword="GAS_EXCHANGE_COEFFICIENT" maximum = "10000.0"
398+
minimum="0.01" value="10.0" primitive-type="double" discreet="false"
399+
default-search-variable="true"/>
376400
<NumericProperty abbreviation="&lt;i&gt;&amp;#949;&lt;/i&gt;"
377401
visible="false"
378402
descriptor="Hemispherical emissivity, &lt;i&gt;&amp;#949;&lt;/i&gt;"
@@ -440,7 +464,15 @@
440464
dimensionfactor="1.0" keyword="BASELINE_INTERCEPT" maximum="20.0"
441465
minimum="-20.0" value="0.0" primitive-type="double" discreet="false"
442466
default-search-variable="false" />
443-
<NumericProperty
467+
<NumericProperty
468+
abbreviation="Bi&lt;sub&gt;g&lt;/sub&gt;"
469+
visible="true"
470+
descriptor="Heat losses (gas), Bi&lt;sub&gt;g&lt;/sub&gt;"
471+
dimensionfactor="1.0" keyword="HEAT_LOSS_GAS" maximum="100.0"
472+
minimum="0.0" value="0.2" primitive-type="double" discreet="false"
473+
default-search-variable="true">
474+
</NumericProperty>
475+
<NumericProperty
444476
abbreviation="Bi (combined)"
445477
visible="false"
446478
descriptor="Heat losses (combined), Bi"

‎src/main/resources/Version.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.95
1+
1.97

‎src/main/resources/messages.properties

Copy file name to clipboardExpand all lines: src/main/resources/messages.properties
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ DiathermicProblem.Descriptor=<html><b>Diathermic Sample with Grey Walls (1D)</b>
4949
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>
5050
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>
5151
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>
52+
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>
5253
Problem.6=Laser Pulse
5354
Problem.7=Heating Curve
5455
DATReader.0=dat
@@ -289,4 +290,5 @@ MixedScheme2.4=<html><b>Increased Accuracy Semi-implicit Scheme</b><ul style='li
289290
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>
290291
TextWrap.0=<html><body><p style='width: 300px;'>
291292
TextWrap.1=</p></body></html>
292-
TextWrap.2=<html><body><p style='width: 185px;'>
293+
TextWrap.2=<html><body><p style='width: 185px;'>
294+
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.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.