Merge pull request #3 from gjmmarquesDEB/update-2015/07/30

Hi, I'm confirming the merge
add-my-pet · Jul 30, 2015 · dfb92ea · dfb92ea
2 parents 6bf9fb5 + 474a255
commit dfb92ea
Show file tree

Hide file tree

Showing 9 changed files with 319 additions and 327 deletions.
diff --git a/lib/misc/C2K.m b/lib/misc/C2K.m
@@ -0,0 +1,27 @@
+%% C2K
+% computes Kelvin from Celsius
+
+%%
+function K = C2K(C)
+  % created by Bas Kooijman 2015/01/30; modified 2015/07/28
+
+  %% Syntax
+  % K = <../C2K.m *C2K*>(C)
+
+  %% Description
+  % Obtains Kelvin from temperatures defined in Celsius
+  %
+  % Input
+  %
+  % * C: scalar or matrix in temperatures in degrees Celsius
+  %  
+  % Output
+  %
+  % * K: temperature(s) in Kelvin
+
+  %% Example 
+  % C2K(20)
+
+  K = C + 273.15; % K, temperature in Kelvin
+end
+
diff --git a/lib/misc/K2C.m b/lib/misc/K2C.m
@@ -0,0 +1,27 @@
+%% K2C
+% computes Celsius from Kelvin
+
+%%
+function C = K2C(K)
+  % created by Bas Kooijman 2015/01/30; modified 2015/07/28
+
+  %% Syntax
+  % K = <../C2K.m *C2K*>(C)
+
+  %% Description
+  % Obtains Kelvin from temperatures defined in degrees Celsius
+  %
+  % Input
+  %
+  % * K: scalar or matrix in temperatures in Kelvin
+  %  
+  % Output
+  %
+  % * C: temperature(s) in degrees Celsius
+
+  %% Example 
+  % K2C(280)
+
+  C = K - 273.15; % K, temperature in Kelvin
+end
+
diff --git a/lib/misc/html/C2K.html b/lib/misc/html/C2K.html
@@ -0,0 +1,90 @@
+
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <!--
+This HTML was auto-generated from MATLAB code.
+To make changes, update the MATLAB code and republish this document.
+      --><title>C2K</title><meta name="generator" content="MATLAB 7.14"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2015-07-28"><meta name="DC.source" content="C2K.m"><style type="text/css">
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outine:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}
+
+html { min-height:100%; margin-bottom:1px; }
+html body { height:100%; margin:0px; font-family:Arial, Helvetica, sans-serif; font-size:10px; color:#000; line-height:140%; background:#fff none; overflow-y:scroll; }
+html body td { vertical-align:top; text-align:left; }
+
+h1 { padding:0px; margin:0px 0px 25px; font-family:Arial, Helvetica, sans-serif; font-size:1.5em; color:#d55000; line-height:100%; font-weight:normal; }
+h2 { padding:0px; margin:0px 0px 8px; font-family:Arial, Helvetica, sans-serif; font-size:1.2em; color:#000; font-weight:bold; line-height:140%; border-bottom:1px solid #d6d4d4; display:block; }
+h3 { padding:0px; margin:0px 0px 5px; font-family:Arial, Helvetica, sans-serif; font-size:1.1em; color:#000; font-weight:bold; line-height:140%; }
+
+a { color:#005fce; text-decoration:none; }
+a:hover { color:#005fce; text-decoration:underline; }
+a:visited { color:#004aa0; text-decoration:none; }
+
+p { padding:0px; margin:0px 0px 20px; }
+img { padding:0px; margin:0px 0px 20px; border:none; }
+p img, pre img, tt img, li img { margin-bottom:0px; } 
+
+ul { padding:0px; margin:0px 0px 20px 23px; list-style:square; }
+ul li { padding:0px; margin:0px 0px 7px 0px; }
+ul li ul { padding:5px 0px 0px; margin:0px 0px 7px 23px; }
+ul li ol li { list-style:decimal; }
+ol { padding:0px; margin:0px 0px 20px 0px; list-style:decimal; }
+ol li { padding:0px; margin:0px 0px 7px 23px; list-style-type:decimal; }
+ol li ol { padding:5px 0px 0px; margin:0px 0px 7px 0px; }
+ol li ol li { list-style-type:lower-alpha; }
+ol li ul { padding-top:7px; }
+ol li ul li { list-style:square; }
+
+.content { font-size:1.2em; line-height:140%; padding: 20px; }
+
+pre, tt, code { font-size:12px; }
+pre { margin:0px 0px 20px; }
+pre.error { color:red; }
+pre.codeinput { padding:10px; border:1px solid #d3d3d3; background:#f7f7f7; }
+pre.codeoutput { padding:10px 11px; margin:0px 0px 20px; color:#4c4c4c; }
+
+@media print { pre.codeinput, pre.codeoutput { word-wrap:break-word; width:100%; } }
+
+span.keyword { color:#0000FF }
+span.comment { color:#228B22 }
+span.string { color:#A020F0 }
+span.untermstring { color:#B20000 }
+span.syscmd { color:#B28C00 }
+
+.footer { width:auto; padding:10px 0px; margin:25px 0px 0px; border-top:1px dotted #878787; font-size:0.8em; line-height:140%; font-style:italic; color:#878787; text-align:left; float:none; }
+.footer p { margin:0px; }
+
+  </style></head><body><div class="content"><h1>C2K</h1><!--introduction--><p>computes Kelvin from Celsius</p><!--/introduction--><h2>Contents</h2><div><ul><li><a href="#3">Syntax</a></li><li><a href="#4">Description</a></li><li><a href="#5">Example</a></li></ul></div><h2>Syntax<a name="3"></a></h2><p>K = <a href="../C2K.m"><b>C2K</b></a>(C)</p><h2>Description<a name="4"></a></h2><p>Obtains Kelvin from temperatures defined in Celsius</p><p>Input</p><div><ul><li>C: scalar or matrix in temperatures in degrees Celsius</li></ul></div><p>Output</p><div><ul><li>K: temperature(s) in Kelvin</li></ul></div><h2>Example<a name="5"></a></h2><p>C2K(20)</p><p class="footer"><br>
+      Published with MATLAB&reg; 7.14<br></p></div><!--
+##### SOURCE BEGIN #####
+%% C2K
+% computes Kelvin from Celsius
+
+%%
+function K = C2K(C)
+  % created by Bas Kooijman 2015/01/30; modified 2015/07/28
+  
+  %% Syntax
+  % K = <../C2K.m *C2K*>(C)
+  
+  %% Description
+  % Obtains Kelvin from temperatures defined in Celsius
+  %
+  % Input
+  %
+  % * C: scalar or matrix in temperatures in degrees Celsius
+  %  
+  % Output
+  %
+  % * K: temperature(s) in Kelvin
+  
+  %% Example 
+  % C2K(20)
+
+  K = C + 273.15; % K, temperature in Kelvin
+end
+
+
+##### SOURCE END #####
+--></body></html>