Moving directory tree one level higher.

doc/README

@@ -1,3 +1,25 @@
+                                "Amsterdam DDA"
+
+                    Maxim A. Yurkin(1,2) and Alfons G. Hoekstra(1)
+
+             (1) Faculty of Science, Section Computational Science,
+                       of the University of Amsterdam,
+              Kruislaan 403, 1098 SJ, Amsterdam, The Netherlands,
+                   tel: +31-20-525-7530, fax: +31-20-525-7490
+
+             (2) Institute of Chemical Kinetics and Combustion,
+               Siberian Branch of the Russian Academy of Sciences,
+                  Institutskaya 3, Novosibirsk, 630090, Russia,
+                    tel: +7-383-333-3240, fax: +7-383-334-2350
+
+                           email: [email protected]
+
+                          last revised: 8 April 2008
+
+                Copyright (C) 2006-2008 University of Amsterdam
+        This software package is covered by the GNU General Public License.
+
+
                 ##             ##### ##         ##### ##         ##
              /####          /#####  /##      /#####  /##      /####
             /  ###        //    /  / ###   //    /  / ###    /  ###
@@ -17,31 +39,6 @@
          ##               ##               ##             ##
 
 
-
-                                Maxim A. Yurkin
-
-                 Institute of Chemical Kinetics and Combustion,
-               Siberian Branch of the Russian Academy of Sciences,
-                  Institutskaya 3, Novosibirsk, 630090, Russia,
-                    tel: +7-383-333-3240, fax: +7-383-334-2350
-
-                               Alfons G. Hoekstra
-
-               Faculty of Science, Section Computational Science,
-                       of the University of Amsterdam,
-              Kruislaan 403, 1098 SJ, Amsterdam, The Netherlands,
-                   tel: +31-20-525-7530, fax: +31-20-525-7490
-
-
-                           email: [email protected]
-
-                     $Date::                            $
-
-                Copyright (C) 2006-2008 University of Amsterdam
-        This software package is covered by the GNU General Public License.
-
-
-
                                 1. INTRODUCTION
                                 ***************
 

doc/faq

@@ -1,7 +1,7 @@
                         Frequently Asked Questions
-                              about ADDA
+                            about Amsterdam DDA
 
-                   $Date::                            $
+                        last revised: 3 June 2007
 
 Q: I have found a bug in ADDA. What should I do?
 A: 1) Make sure you are using the latest version of ADDA (check the ADDA
@@ -14,7 +14,6 @@ A: 1) Make sure you are using the latest version of ADDA (check the ADDA
    parameters as possible without removing the bug. Also try to use defautl
    versions of input files, that you have modified.
    5) Send the results of (3) and (4) to the authors, together with all input
-
    files and Makefiles that you have used for compilation. Do not forget to
    include all the relevant output files,  at least 'log'. Please also include
    a brief description of your operation system and hardware. We will try to
@@ -71,14 +70,5 @@ A: The simplest is to specify your particle by a shape file. However, if your
    source files to the authors so they would be incorporated in the next
    release for the benefit of the community.
 
-Q: How is the Mueller matrix, produced by ADDA, defined and/or normalized?
-A: It is defined as in Bohren & Huffman "Absorption and scattering of Light by
-   Small Particles" (1983), and it is not normalized. Some other codes may
-   compute Stokes scattering matrix, which is normalized so that 1,1-element
-   is equal to 1 after averaging over the whole solid angle. This matrix
-   should be multiplied by (pi*Csca/(lambda^2)) to get Mueller matrix. Csca is
-   the scattering cross section for unpolarized light, equal to average of
-   scattering cross sections for any two perpendicular incident polarizations.
-
 This list is far from being complete. Please send your questions to
 [email protected]

src/ADDAmain.c

@@ -3,7 +3,7 @@
  * DESCR: Main. All the work moved to other modules.
  *
  *        Previous versions were developed by Alfons Hoekstra.
- *        Sequential version, Michel Grimminck January 1995
+ *        Sequential version, Michel Grimminck Jan 1995
  *
  * Copyright (C) 2006-2008 University of Amsterdam
  * This code is covered by the GNU General Public License.
@@ -15,58 +15,59 @@
 #include "debug.h"
 #include "io.h"
 
-// EXTERNAL FUNCTIONS
+/* EXTERNAL FUNCTIONS */
 
-// calculator.c
+/* calculator.c */
 void Calculator(void);
-// make_particle.c
+/* make_particle.c */
 void InitShape(void);
 int MakeParticle(void);
-// param.c
+/* param.c */
 void InitVariables(void);
 void ParseParameters(int argc,char **argv);
 void VariablesInterconnect(void);
 void DirectoryLog(int argc,char **argv);
 void PrintInfo(void);
 
-//============================================================
+/*============================================================*/
 
 int main(int argc,char **argv)
 {
-	// Initialize error handling and line wrapping
-	logfile=NULL;
-	term_width=DEF_TERM_WIDTH;
-	// Start global time
-	StartTime();
-	// Initialize communications
-	InitComm(&argc,&argv);
-	// Initialize and parse input parameters
-	InitVariables();
-	ParseParameters(argc,argv);
-	D("Reading command line finished");
-	VariablesInterconnect(); // also initializes beam
-	// Initialize symmetries and box's; get number of dipoles; set some variables
-	InitShape();
-	// !!! before this line errors should be printed in simple format, after - in advanced one
-	// Create directory and start logfile (print command line)
-	DirectoryLog(argc,argv);
-	// Initialize FFT grid and its subdivision over processors
-	ParSetup();
-	// MakeParticle; initialize dpl and nlocalRows
-	MakeParticle();
-	// Print info to stdout and logfile
-	PrintInfo();
-	// Main calculation part
-	D("Calculator started");
-	Calculator();
-	D("Calculator finished");
-	// Print timing and statistics; close logfile
-	FinalStatistics();
-	// check error on stdout
-	if (ferror(stdout)) LogError(EC_WARN,ALL_POS,
-		"Some errors occurred while writing to stdout during the execution of ADDA");
-	// finish execution normally
-	Stop(0);
-	// never actually reached; just to make the compiler happy
-	return 0;
+  /* initialize error handling and line wrapping */
+  logfile=NULL;
+  term_width=DEF_TERM_WIDTH;
+  /* start global time */
+  StartTime();
+  /* initialize communications */
+  InitComm(&argc,&argv);
+  /* initialize and parse input parameters */
+  InitVariables();
+  ParseParameters(argc,argv);
+  D("Reading command line finished");
+  VariablesInterconnect();    /* also initializes beam */
+  /* initialize symmetries and box's; get number of dipoles; set some variables */
+  InitShape();
+  /* !!! before errorrs should be printed in simple format, after in more advanced one !!! */
+  /* Create directory and start logfile (print command line) */
+  DirectoryLog(argc,argv);
+  /* initialize FFT grid and its subdivision over processors */
+  ParSetup();
+  /* MakeParticle; initialize dpl and nlocalRows */
+  MakeParticle();
+  /* print info to stdout and logfile */
+  PrintInfo();
+  /* initialize times and counters */
+  /* Main calculation part */
+  D("Calculator started");
+  Calculator();
+  D("Calculator finished");
+  /* print timing and statistics; close logfile */
+  FinalStatistics();
+  /* check error on stdout */
+  if (ferror(stdout)) LogError(EC_WARN,ALL_POS,
+    "Some errors occured while writing to stdout during the execution of ADDA");
+  /* finish execution normally */
+  Stop(0);
+  /* never actually reached; just to make the compiler happy */
+  return 0;
 }