Skip to content

Commit 0ce71ac

Browse files
author
Dilawar Singh
committed
genesis and kkit are reverted back to master.
1 parent 6535c46 commit 0ce71ac

File tree

13 files changed

+372
-270
lines changed

13 files changed

+372
-270
lines changed

‎kinetics/Reac.cpp‎

Lines changed: 70 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -17,150 +17,140 @@
1717

1818
const Cinfo* Reac::initCinfo()
1919
{
20-
//////////////////////////////////////////////////////////////
21-
// Field Definitions: All inherited from ReacBase
22-
//////////////////////////////////////////////////////////////
23-
//////////////////////////////////////////////////////////////
24-
// MsgDest Definitions: All inherited
25-
//////////////////////////////////////////////////////////////
26-
//////////////////////////////////////////////////////////////
27-
// Shared Msg Definitions: All inherited.
28-
//////////////////////////////////////////////////////////////
29-
static Dinfo< Reac > dinfo;
30-
static Cinfo reacCinfo (
31-
"Reac",
32-
ReacBase::initCinfo(),
33-
0,
34-
0,
35-
&dinfo
36-
);
37-
38-
return &reacCinfo;
20+
//////////////////////////////////////////////////////////////
21+
// Field Definitions: All inherited from ReacBase
22+
//////////////////////////////////////////////////////////////
23+
//////////////////////////////////////////////////////////////
24+
// MsgDest Definitions: All inherited
25+
//////////////////////////////////////////////////////////////
26+
//////////////////////////////////////////////////////////////
27+
// Shared Msg Definitions: All inherited.
28+
//////////////////////////////////////////////////////////////
29+
static Dinfo<Reac> dinfo;
30+
static Cinfo reacCinfo("Reac", ReacBase::initCinfo(), 0, 0, &dinfo);
31+
32+
return &reacCinfo;
3933
}
4034

4135
static const Cinfo* reacCinfo = Reac::initCinfo();
4236

43-
static const SrcFinfo2< double, double >* subOut =
44-
dynamic_cast< const SrcFinfo2< double, double >* >(
45-
reacCinfo->findFinfo( "subOut" ) );
37+
static const SrcFinfo2<double, double>* subOut =
38+
dynamic_cast<const SrcFinfo2<double, double>*>(
39+
reacCinfo->findFinfo("subOut"));
4640

47-
static const SrcFinfo2< double, double >* prdOut =
48-
dynamic_cast< const SrcFinfo2< double, double >* >(
49-
reacCinfo->findFinfo( "prdOut" ) );
41+
static const SrcFinfo2<double, double>* prdOut =
42+
dynamic_cast<const SrcFinfo2<double, double>*>(
43+
reacCinfo->findFinfo("prdOut"));
5044

5145
//////////////////////////////////////////////////////////////
5246
// Reac internal functions
5347
//////////////////////////////////////////////////////////////
5448

55-
56-
Reac::Reac( )
57-
: kf_( 0.1 ), kb_( 0.2 ), sub_( 0.0 ), prd_( 0.0 )
49+
Reac::Reac() : kf_(0.1), kb_(0.2), sub_(0.0), prd_(0.0)
5850
{
59-
;
51+
;
6052
}
6153

6254
/*
6355
Reac::Reac( double kf, double kb )
64-
: kf_( kf ), kb_( kb ), concKf_( 0.1 ), concKb_( 0.2 ),
65-
sub_( 0.0 ), prd_( 0.0 )
56+
: kf_( kf ), kb_( kb ), concKf_( 0.1 ), concKb_( 0.2 ),
57+
sub_( 0.0 ), prd_( 0.0 )
6658
{
67-
;
59+
;
6860
}
6961
*/
7062

7163
//////////////////////////////////////////////////////////////
7264
// MsgDest Definitions
7365
//////////////////////////////////////////////////////////////
7466

75-
void Reac::vSub( double v )
67+
void Reac::vSub(double v)
7668
{
77-
sub_ *= v;
69+
sub_ *= v;
7870
}
7971

80-
void Reac::vPrd( double v )
72+
void Reac::vPrd(double v)
8173
{
82-
prd_ *= v;
74+
prd_ *= v;
8375
}
8476

85-
void Reac::vProcess( const Eref& e, ProcPtr p )
77+
void Reac::vProcess(const Eref& e, ProcPtr p)
8678
{
87-
prdOut->send( e, sub_, prd_ );
88-
subOut->send( e, prd_, sub_ );
79+
prdOut->send(e, sub_, prd_);
80+
subOut->send(e, prd_, sub_);
8981

90-
sub_ = kf_;
91-
prd_ = kb_;
82+
sub_ = kf_;
83+
prd_ = kb_;
9284
}
9385

94-
void Reac::vReinit( const Eref& e, ProcPtr p )
86+
void Reac::vReinit(const Eref& e, ProcPtr p)
9587
{
96-
sub_ = kf_ = concKf_ /
97-
convertConcToNumRateUsingMesh( e, subOut, 0 );
98-
prd_ = kb_ = concKb_ /
99-
convertConcToNumRateUsingMesh( e, prdOut, 0 );
88+
sub_ = kf_ = concKf_ / convertConcToNumRateUsingMesh(e, subOut, 0);
89+
prd_ = kb_ = concKb_ / convertConcToNumRateUsingMesh(e, prdOut, 0);
10090
}
10191

102-
void Reac::vRemesh( const Eref& e )
92+
void Reac::vRemesh(const Eref& e)
10393
{
104-
kf_ = concKf_ / convertConcToNumRateUsingMesh( e, subOut, 0 );
105-
kb_ = concKb_ / convertConcToNumRateUsingMesh( e, prdOut, 0 );
94+
kf_ = concKf_ / convertConcToNumRateUsingMesh(e, subOut, 0);
95+
kb_ = concKb_ / convertConcToNumRateUsingMesh(e, prdOut, 0);
10696
}
10797

10898
//////////////////////////////////////////////////////////////
10999
// Field Definitions
110100
//////////////////////////////////////////////////////////////
111101

112-
void Reac::vSetNumKf( const Eref& e, double v )
102+
void Reac::vSetNumKf(const Eref& e, double v)
113103
{
114-
sub_ = kf_ = v;
115-
double volScale = convertConcToNumRateUsingMesh( e, subOut, false );
116-
concKf_ = kf_ * volScale;
104+
sub_ = kf_ = v;
105+
double volScale = convertConcToNumRateUsingMesh(e, subOut, false);
106+
concKf_ = kf_ * volScale;
117107
}
118108

119-
double Reac::vGetNumKf( const Eref& e) const
109+
double Reac::vGetNumKf(const Eref& e) const
120110
{
121-
double kf = concKf_ / convertConcToNumRateUsingMesh( e, subOut, false );
122-
return kf;
111+
double kf = concKf_ / convertConcToNumRateUsingMesh(e, subOut, false);
112+
return kf;
123113
}
124114

125-
void Reac::vSetNumKb( const Eref& e, double v )
115+
void Reac::vSetNumKb(const Eref& e, double v)
126116
{
127-
prd_ = kb_ = v;
128-
/*
129-
double volScale = convertConcToNumRateUsingMesh( e, prdOut, true );
130-
vector< double > vols;
131-
getReactantVols( e, subOut, vols );
132-
assert( vols.size() > 0 );
133-
volScale /= (vols[0] * NA);
134-
*/
117+
prd_ = kb_ = v;
118+
/*
119+
double volScale = convertConcToNumRateUsingMesh( e, prdOut, true );
120+
vector< double > vols;
121+
getReactantVols( e, subOut, vols );
122+
assert( vols.size() > 0 );
123+
volScale /= (vols[0] * NA);
124+
*/
135125

136-
double volScale = convertConcToNumRateUsingMesh( e, prdOut, false );
137-
concKb_ = kb_ * volScale;
126+
double volScale = convertConcToNumRateUsingMesh(e, prdOut, false);
127+
concKb_ = kb_ * volScale;
138128
}
139129

140-
double Reac::vGetNumKb( const Eref& e ) const
130+
double Reac::vGetNumKb(const Eref& e) const
141131
{
142-
double kb = concKb_ / convertConcToNumRateUsingMesh( e, prdOut, 0 );
143-
return kb;
132+
double kb = concKb_ / convertConcToNumRateUsingMesh(e, prdOut, 0);
133+
return kb;
144134
}
145135

146-
void Reac::vSetConcKf( const Eref& e, double v )
136+
void Reac::vSetConcKf(const Eref& e, double v)
147137
{
148-
concKf_ = v;
149-
sub_ = kf_ = v / convertConcToNumRateUsingMesh( e, subOut, 0 );
138+
concKf_ = v;
139+
sub_ = kf_ = v / convertConcToNumRateUsingMesh(e, subOut, 0);
150140
}
151141

152-
double Reac::vGetConcKf( const Eref& e ) const
142+
double Reac::vGetConcKf(const Eref& e) const
153143
{
154-
return concKf_;
144+
return concKf_;
155145
}
156146

157-
void Reac::vSetConcKb( const Eref& e, double v )
147+
void Reac::vSetConcKb(const Eref& e, double v)
158148
{
159-
concKb_ = v;
160-
prd_ = kb_ = v / convertConcToNumRateUsingMesh( e, prdOut, 0 );
149+
concKb_ = v;
150+
prd_ = kb_ = v / convertConcToNumRateUsingMesh(e, prdOut, 0);
161151
}
162152

163-
double Reac::vGetConcKb( const Eref& e ) const
153+
double Reac::vGetConcKb(const Eref& e) const
164154
{
165-
return concKb_;
155+
return concKb_;
166156
}

0 commit comments

Comments
 (0)