Revision 1109 trunk/src/df1b2-separable/df1b2fun.cpp

df1b2fun.cpp (revision 1109)
2 2
 * $Id$
3 3
 *
4 4
 * Author: David Fournier
5
 * Copyright (c) 2008-2012 Regents of the University of California 
5
 * Copyright (c) 2008-2012 Regents of the University of California
6 6
 */
7 7
/**
8 8
 * \file
......
21 21

  
22 22
//int df1b2variable::noallocate=0;
23 23

  
24
//initial_df1b2params ** initial_df1b2params::varsptr 
24
//initial_df1b2params ** initial_df1b2params::varsptr
25 25
//  =new P_INITIAL_DF1B2PARAMS[1000];
26 26
//int initial_df1b2params::num_initial_df1b2params=0;         // array
27 27

  
28 28
//int initial_df1b2params::num_initial_df1b2params_sav=0;         // array
29
//initial_df1b2params ** initial_df1b2params::varsptr_sav=0; 
29
//initial_df1b2params ** initial_df1b2params::varsptr_sav=0;
30 30

  
31 31
//int initial_df1b2params::current_phase=0;
32 32

  
......
36 36
 * Description not yet available.
37 37
 * \param
38 38
 */
39
void df1b2variable::save_adpool_pointer(void) 
40
{ 
39
void df1b2variable::save_adpool_pointer(void)
40
{
41 41
  if (adpool_stack_pointer> adpool_stack_size-1)
42 42
  {
43 43
    cerr << "overflow in save_adpool_pointer" << endl;
......
51 51
 * Description not yet available.
52 52
 * \param
53 53
 */
54
void df1b2variable::restore_adpool_pointer(void) 
55
{ 
54
void df1b2variable::restore_adpool_pointer(void)
55
{
56 56
  if (adpool_stack_pointer<=0)
57 57
  {
58 58
    cerr << "underflow in save_adpool_pointer" << endl;
......
73 73
  varsptr=new P_INITIAL_DF1B2PARAMS[1000];
74 74
  if (varsptr == 0)
75 75
  {
76
    cerr << "error allocating memory for " 
76
    cerr << "error allocating memory for "
77 77
      "initial_df1b2params::varsptr  " << endl;
78 78
    ad_exit(1);
79 79
  }
80 80

  
81
  num_initial_df1b2params_sav=num_initial_df1b2params; 
81
  num_initial_df1b2params_sav=num_initial_df1b2params;
82 82
  num_initial_df1b2params =0;
83 83
}
84 84

  
......
98 98
    varsptr=initial_df1b2params::varsptr_sav;
99 99
    varsptr_sav=0;
100 100

  
101
    num_initial_df1b2params= num_initial_df1b2params_sav; 
102
    num_initial_df1b2params_sav=0; 
101
    num_initial_df1b2params= num_initial_df1b2params_sav;
102
    num_initial_df1b2params_sav=0;
103 103
  }
104 104
  else
105 105
  {
......
111 111
           << endl;
112 112
      ad_exit(1);
113 113
    }
114
 
114

  
115 115
    for (int i=0;i<num_initial_df1b2params_sav;i++)
116 116
    {
117 117
      varsptr[i+num_initial_df1b2params]=varsptr_sav[i];
118 118
    }
119
    num_initial_df1b2params+=num_initial_df1b2params_sav; 
119
    num_initial_df1b2params+=num_initial_df1b2params_sav;
120 120
    delete varsptr_sav;
121 121
    varsptr_sav=0;
122
    num_initial_df1b2params_sav=0; 
122
    num_initial_df1b2params_sav=0;
123 123
  }
124 124
}
125
   
125

  
126 126
/**
127 127
 * Description not yet available.
128 128
 * \param
......
156 156
  int xcount=0;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff