Update to 7.10 adding ZernikeExpansion_BRDF_Model

usnistgov · Oct 19, 2017 · 953334a · 953334a
1 parent b22e463
commit 953334a
Show file tree

Hide file tree

Showing 84 changed files with 89 additions and 90 deletions.
diff --git a/code/Makefile b/code/Makefile
@@ -9,7 +9,6 @@
 #//** Phone: (301) 975-2876
 #//** Email: thomas.germer@nist.gov
 #//**
-#//**
 #//******************************************************************************
 
 
@@ -138,7 +137,8 @@ OBJECTS = allrough.o \
 	two_source.o \
 	twoface.o \
 	urough.o \
-	vector3d.o 
+	vector3d.o \
+	zernikeexpansion.o 
 
 
 .PHONY : all

diff --git a/code/askuser.cpp b/code/askuser.cpp
@@ -29,7 +29,7 @@ namespace SCATMECH {
     string
     Get_SCATMECH_Version()
     {
-        return std::string("SCATMECH 7.01 (Build: ") + std::string(__DATE__) + std::string(")");
+        return std::string("SCATMECH 7.10 (Build: ") + std::string(__DATE__) + std::string(")");
     }
 
     optical_constant default_substrate(4.15,0.05);

diff --git a/docs/BRDF_Model.htm b/docs/BRDF_Model.htm
@@ -476,7 +476,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 </td>

diff --git a/docs/axipart.htm b/docs/axipart.htm
@@ -341,7 +341,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 </td>

diff --git a/docs/axishape.htm b/docs/axishape.htm
@@ -683,7 +683,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 </td>
 </tr>

diff --git a/docs/bobvlieg.htm b/docs/bobvlieg.htm
@@ -393,7 +393,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 </td>
 </tr>

diff --git a/docs/coatedmiescat.htm b/docs/coatedmiescat.htm
@@ -169,7 +169,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/convent.htm b/docs/convent.htm
@@ -77,7 +77,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 </td>

diff --git a/docs/correlated_stack.htm b/docs/correlated_stack.htm
@@ -183,7 +183,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/corrough.htm b/docs/corrough.htm
@@ -245,7 +245,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/crossgrating.htm b/docs/crossgrating.htm
@@ -1068,7 +1068,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/crossrcwbrdf.htm b/docs/crossrcwbrdf.htm
@@ -140,7 +140,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 </td>

diff --git a/docs/crossrcwmodel.htm b/docs/crossrcwmodel.htm
@@ -244,7 +244,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/dielectric.htm b/docs/dielectric.htm
@@ -231,7 +231,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 
 <br>
 

diff --git a/docs/dielfunc.htm b/docs/dielfunc.htm
@@ -303,7 +303,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/dielstack.htm b/docs/dielstack.htm
@@ -642,7 +642,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/diffuse.htm b/docs/diffuse.htm
@@ -177,7 +177,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/download.htm b/docs/download.htm
@@ -25,11 +25,10 @@ <h1><a name="top" id="top">Download
 
          <h2>Download:</h2>
 
-	<p>Download release Version 7.01 as
-	  <a href="https://github.com/thomas-germer/SCATMECH/archive/v7.01.zip">SCATMECH-7.01.zip</a> or 
-	  <a href="https://github.com/thomas-germer/SCATMECH/archive/v7.01.tar.gz">SCATMECH-7.01.tar.gz</a></p>
+	<p>
+	  <a href="https://github.com/usnistgov/SCATMECH/releases/latest">Download the latest release version here.</a> 
 
-        <p>To download the latest pre-release version of the library, <a href="https://github.com/thomas-germer/SCATMECH">go to GitHub SCATMECH repository</a> and choose Clone or Download.</p>
+        <p>To download the latest pre-release version of the library, <a href="https://github.com/USNISTGOV/SCATMECH">go to GitHub SCATMECH repository</a> and choose Clone or Download.</p>
 
 
 <!-- START FOOTER -->
@@ -43,7 +42,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/elements.htm b/docs/elements.htm
@@ -414,7 +414,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/examples.htm b/docs/examples.htm
@@ -324,7 +324,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/except.htm b/docs/except.htm
@@ -95,7 +95,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/facet.htm b/docs/facet.htm
@@ -229,7 +229,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/finiteaperture.htm b/docs/finiteaperture.htm
@@ -165,7 +165,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/firstdiffuse.htm b/docs/firstdiffuse.htm
@@ -191,7 +191,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/flake.htm b/docs/flake.htm
@@ -247,7 +247,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/focussedbeam.htm b/docs/focussedbeam.htm
@@ -180,7 +180,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/four_source.htm b/docs/four_source.htm
@@ -218,7 +218,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/freescat.htm b/docs/freescat.htm
@@ -151,7 +151,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/grating.htm b/docs/grating.htm
@@ -1338,7 +1338,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/growth_stack.htm b/docs/growth_stack.htm
@@ -239,7 +239,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/history.htm b/docs/history.htm
@@ -980,7 +980,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/index.htm b/docs/index.htm
@@ -52,7 +52,7 @@ <h1>SCATMECH:<br>
 
 <h2>Current Version</h2>
 
-<p><a href="download.htm">Download version 7.01 (September 2017)</a><br>
+<p><a href="download.htm">Download version 7.10 (October 2017)</a><br>
 <a href="history.htm">See version history</a></p>
 
 <h2>Author</h2>
@@ -116,7 +116,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 <!-- END FOOTER -->
 

diff --git a/docs/inherit.htm b/docs/inherit.htm
@@ -193,7 +193,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/instrument.htm b/docs/instrument.htm
@@ -140,7 +140,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/interface.htm b/docs/interface.htm
@@ -367,7 +367,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/intro.htm b/docs/intro.htm
@@ -138,7 +138,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/jonesmatrix.htm b/docs/jonesmatrix.htm
@@ -403,7 +403,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/jonesvector.htm b/docs/jonesvector.htm
@@ -468,7 +468,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/lambert.htm b/docs/lambert.htm
@@ -186,7 +186,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>

diff --git a/docs/local.htm b/docs/local.htm
@@ -350,7 +350,7 @@ <h2>For More Information</h2>
 <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
 
 <p>
-Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
 <br>
 
 </td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -476,7 +476,7 @@ <h2>For More Information</h2> @@
     <a href="mailto:thomas.germer@nist.gov">Website Comments</a>
     <p>
-    Current SCATMECH version: <a href="./download.htm">7.01 (September 2017)</a><br>
+    Current SCATMECH version: <a href="./download.htm">7.10 (October 2017)</a><br>
     <br>
     </td>
@@ Expand Down @@