Skip to content

Commit 175a156

Browse files
myurkinmyurkin
committed
Moving directory tree one level higher.
1 parent 57f1079 commit 175a156

44 files changed

Lines changed: 9612 additions & 10022 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/README‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
"Amsterdam DDA"
2+
3+
Maxim A. Yurkin(1,2) and Alfons G. Hoekstra(1)
4+
5+
(1) Faculty of Science, Section Computational Science,
6+
of the University of Amsterdam,
7+
Kruislaan 403, 1098 SJ, Amsterdam, The Netherlands,
8+
tel: +31-20-525-7530, fax: +31-20-525-7490
9+
10+
(2) Institute of Chemical Kinetics and Combustion,
11+
Siberian Branch of the Russian Academy of Sciences,
12+
Institutskaya 3, Novosibirsk, 630090, Russia,
13+
tel: +7-383-333-3240, fax: +7-383-334-2350
14+
15+
email: adda@science.uva.nl
16+
17+
last revised: 8 April 2008
18+
19+
Copyright (C) 2006-2008 University of Amsterdam
20+
This software package is covered by the GNU General Public License.
21+
22+
123
## ##### ## ##### ## ##
224
/#### /##### /## /##### /## /####
325
/ ### // / / ### // / / ### / ###
@@ -17,31 +39,6 @@
1739
## ## ## ##
1840

1941

20-
21-
Maxim A. Yurkin
22-
23-
Institute of Chemical Kinetics and Combustion,
24-
Siberian Branch of the Russian Academy of Sciences,
25-
Institutskaya 3, Novosibirsk, 630090, Russia,
26-
tel: +7-383-333-3240, fax: +7-383-334-2350
27-
28-
Alfons G. Hoekstra
29-
30-
Faculty of Science, Section Computational Science,
31-
of the University of Amsterdam,
32-
Kruislaan 403, 1098 SJ, Amsterdam, The Netherlands,
33-
tel: +31-20-525-7530, fax: +31-20-525-7490
34-
35-
36-
email: adda@science.uva.nl
37-
38-
$Date:: $
39-
40-
Copyright (C) 2006-2008 University of Amsterdam
41-
This software package is covered by the GNU General Public License.
42-
43-
44-
4542
1. INTRODUCTION
4643
***************
4744

‎doc/faq‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Frequently Asked Questions
2-
about ADDA
2+
about Amsterdam DDA
33

4-
$Date:: $
4+
last revised: 3 June 2007
55

66
Q: I have found a bug in ADDA. What should I do?
77
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
1414
parameters as possible without removing the bug. Also try to use defautl
1515
versions of input files, that you have modified.
1616
5) Send the results of (3) and (4) to the authors, together with all input
17-
1817
files and Makefiles that you have used for compilation. Do not forget to
1918
include all the relevant output files, at least 'log'. Please also include
2019
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
7170
source files to the authors so they would be incorporated in the next
7271
release for the benefit of the community.
7372

74-
Q: How is the Mueller matrix, produced by ADDA, defined and/or normalized?
75-
A: It is defined as in Bohren & Huffman "Absorption and scattering of Light by
76-
Small Particles" (1983), and it is not normalized. Some other codes may
77-
compute Stokes scattering matrix, which is normalized so that 1,1-element
78-
is equal to 1 after averaging over the whole solid angle. This matrix
79-
should be multiplied by (pi*Csca/(lambda^2)) to get Mueller matrix. Csca is
80-
the scattering cross section for unpolarized light, equal to average of
81-
scattering cross sections for any two perpendicular incident polarizations.
82-
8373
This list is far from being complete. Please send your questions to
8474
adda@science.uva.nl

‎src/ADDAmain.c‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* DESCR: Main. All the work moved to other modules.
44
*
55
* Previous versions were developed by Alfons Hoekstra.
6-
* Sequential version, Michel Grimminck January 1995
6+
* Sequential version, Michel Grimminck Jan 1995
77
*
88
* Copyright (C) 2006-2008 University of Amsterdam
99
* This code is covered by the GNU General Public License.
@@ -15,58 +15,59 @@
1515
#include "debug.h"
1616
#include "io.h"
1717

18-
// EXTERNAL FUNCTIONS
18+
/* EXTERNAL FUNCTIONS */
1919

20-
// calculator.c
20+
/* calculator.c */
2121
void Calculator(void);
22-
// make_particle.c
22+
/* make_particle.c */
2323
void InitShape(void);
2424
int MakeParticle(void);
25-
// param.c
25+
/* param.c */
2626
void InitVariables(void);
2727
void ParseParameters(int argc,char **argv);
2828
void VariablesInterconnect(void);
2929
void DirectoryLog(int argc,char **argv);
3030
void PrintInfo(void);
3131

32-
//============================================================
32+
/*============================================================*/
3333

3434
int main(int argc,char **argv)
3535
{
36-
// Initialize error handling and line wrapping
37-
logfile=NULL;
38-
term_width=DEF_TERM_WIDTH;
39-
// Start global time
40-
StartTime();
41-
// Initialize communications
42-
InitComm(&argc,&argv);
43-
// Initialize and parse input parameters
44-
InitVariables();
45-
ParseParameters(argc,argv);
46-
D("Reading command line finished");
47-
VariablesInterconnect(); // also initializes beam
48-
// Initialize symmetries and box's; get number of dipoles; set some variables
49-
InitShape();
50-
// !!! before this line errors should be printed in simple format, after - in advanced one
51-
// Create directory and start logfile (print command line)
52-
DirectoryLog(argc,argv);
53-
// Initialize FFT grid and its subdivision over processors
54-
ParSetup();
55-
// MakeParticle; initialize dpl and nlocalRows
56-
MakeParticle();
57-
// Print info to stdout and logfile
58-
PrintInfo();
59-
// Main calculation part
60-
D("Calculator started");
61-
Calculator();
62-
D("Calculator finished");
63-
// Print timing and statistics; close logfile
64-
FinalStatistics();
65-
// check error on stdout
66-
if (ferror(stdout)) LogError(EC_WARN,ALL_POS,
67-
"Some errors occurred while writing to stdout during the execution of ADDA");
68-
// finish execution normally
69-
Stop(0);
70-
// never actually reached; just to make the compiler happy
71-
return 0;
36+
/* initialize error handling and line wrapping */
37+
logfile=NULL;
38+
term_width=DEF_TERM_WIDTH;
39+
/* start global time */
40+
StartTime();
41+
/* initialize communications */
42+
InitComm(&argc,&argv);
43+
/* initialize and parse input parameters */
44+
InitVariables();
45+
ParseParameters(argc,argv);
46+
D("Reading command line finished");
47+
VariablesInterconnect(); /* also initializes beam */
48+
/* initialize symmetries and box's; get number of dipoles; set some variables */
49+
InitShape();
50+
/* !!! before errorrs should be printed in simple format, after in more advanced one !!! */
51+
/* Create directory and start logfile (print command line) */
52+
DirectoryLog(argc,argv);
53+
/* initialize FFT grid and its subdivision over processors */
54+
ParSetup();
55+
/* MakeParticle; initialize dpl and nlocalRows */
56+
MakeParticle();
57+
/* print info to stdout and logfile */
58+
PrintInfo();
59+
/* initialize times and counters */
60+
/* Main calculation part */
61+
D("Calculator started");
62+
Calculator();
63+
D("Calculator finished");
64+
/* print timing and statistics; close logfile */
65+
FinalStatistics();
66+
/* check error on stdout */
67+
if (ferror(stdout)) LogError(EC_WARN,ALL_POS,
68+
"Some errors occured while writing to stdout during the execution of ADDA");
69+
/* finish execution normally */
70+
Stop(0);
71+
/* never actually reached; just to make the compiler happy */
72+
return 0;
7273
}

0 commit comments

Comments
 (0)