Преглед изворни кода

Changed version number and made some small fixes.

Ovidio Peña Rodríguez пре 5 година
родитељ
комит
48e7762a08
7 измењених фајлова са 12 додато и 13 уклоњено
  1. 2 2
      COPYING
  2. 1 1
      PKG-INFO
  3. 1 0
      README.md
  4. 1 1
      debian/control
  5. 3 3
      debian/copyright
  6. 1 1
      debian/watch
  7. 3 5
      src/nearfield.cc

+ 2 - 2
COPYING

@@ -1,5 +1,5 @@
-    Copyright (C) 2009-2018 Ovidio Peña <ovidio@bytesfall.com>
-    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
+    Copyright (C) 2009-2019 Ovidio Peña <ovidio@bytesfall.com>
+    Copyright (C) 2013-2019 Konstantin Ladutenko <kostyfisik@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

+ 1 - 1
PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: python-scattnlay
-Version: 2.2
+Version: 2.3
 Summary: Calculation of the scattering of EM radiation by a multilayered sphere
 Home-page: http://scattering.sourceforge.net/
 Author: Ovidio Peña Rodríguez

+ 1 - 0
README.md

@@ -42,6 +42,7 @@ To compile the Python extension you need [NumPy](http://www.numpy.org/):
  - **python-numpy (>= 1.0)**
  - **python-all-dev (any version)**
  - **python-numpy-dev (any version)**
+ - **pybind11 (any version)**
 
 And to compile the Debian package you need some tools:
 

+ 1 - 1
debian/control

@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Ovidio Peña Rodríguez <ovidio@bytesfall.com>
 Build-Depends: debhelper (>=7.0.0), dh-python, cdbs (>= 0.4.49), libboost-all-dev (>= 1.58.0), python-numpy (>= 1.0), python-all-dev, python-numpy-dev
-X-Python-Version: >=2.4
+X-Python-Version: >=2.7
 Standards-Version: 3.8.3
 
 Package: python-scattnlay

+ 3 - 3
debian/copyright

@@ -1,5 +1,5 @@
 This package was debianized by Ovidio Peña Rodríguez
- on Wed, 19 Feb 2018 11:50:00 +0100.
+ on Fri, 04 Oct 2019 17:50:00 +0100.
 
 It was downloaded from https://github.com/ovidiopr/scattnlay
 
@@ -9,8 +9,8 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2009-2018 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
-    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
+    Copyright (C) 2009-2019 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+    Copyright (C) 2013-2019 Konstantin Ladutenko <kostyfisik@gmail.com>
 
 License:
 

+ 1 - 1
debian/watch

@@ -1,2 +1,2 @@
 version=3
-https://github.com/ovidiopr/scattnlay/archive/v2\.2\.0\.tar\.gz
+https://github.com/ovidiopr/scattnlay/archive/v2\.3\.0\.tar\.gz

+ 3 - 5
src/nearfield.cc

@@ -48,7 +48,8 @@ const double PI=3.14159265358979323846;
 // This is the main function of 'scattnlay', here we read the parameters as          //
 // arguments passed to the program which should be executed with the following       //
 // syntaxis:                                                                         //
-// ./scattnlay -l Layers x1 m1.r m1.i [x2 m2.r m2.i ...] [-t ti tf nt] [-c comment]  //
+// ./fieldnlay -l Layers x1 m1.r m1.i [x2 m2.r m2.i ...]                             //
+//             -p xi xf nx yi yf ny zi zf nz [-c comment]                            //
 //                                                                                   //
 // When all the parameters were correctly passed we setup the integer L (the         //
 // number of layers) and the arrays x and m, containing the size parameters and      //
@@ -56,11 +57,8 @@ const double PI=3.14159265358979323846;
 // If the calculation is successful the results are printed with the following       //
 // format:                                                                           //
 //                                                                                   //
-//    * If no comment was passed:                                                    //
-//        'Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo'                                    //
+// 'X, Y, Z, Ex.r, Ex.i, Ey.r, Ey.i, Ez.r, Ez.i, Hx.r, Hx.i, Hy.r, Hy.i, Hz.r, Hz.i' //
 //                                                                                   //
-//    * If a comment was passed:                                                     //
-//        'comment, Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo'                           //
 //***********************************************************************************//
 int main(int argc, char *argv[]) {
   try {