Adding kappa2 for NDDETRATMONOMIAL,NDCLDETRATMONOMIAL

sbacchio · sbacchio · commit 8b0377999eb4 · 2018-10-12T12:55:58.000+03:00
diff --git a/read_input.l b/read_input.l
@@ -1802,7 +1802,7 @@ static inline double fltlist_next_token(int * const list_end){
   }
 }
 
-<DETMONOMIAL,POLYMONOMIAL,CLDETRATRWMONOMIAL,NDDETRATMONOMIAL,NDCLDETRATMONOMIAL>{
+<DETMONOMIAL,POLYMONOMIAL,CLDETRATRWMONOMIAL>{
   {SPC}*2KappaMu2{EQL}{FLT} {
     sscanf(yytext, " %[2a-zA-Z] = %lf", name, &c);
     mnl->mu2 = c;
@@ -1815,6 +1815,14 @@ static inline double fltlist_next_token(int * const list_end){
   }
 }
 
+<NDDETRATMONOMIAL,NDCLDETRATMONOMIAL>{
+  {SPC}*Kappa2{EQL}{FLT} {
+    sscanf(yytext, " %[2a-zA-Z] = %lf", name, &c);
+    mnl->kappa2 = c;
+    if(myverbose) printf("  kappa2 set to %f line %d monomial %d\n", c, line_of_file, current_monomial);
+  }
+}
+
 <NDCLRATMONOMIAL,CLRATMONOMIAL>{
   {SPC}*AddTrLog{EQL}yes {
     mnl->trlog = 1;

Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ static inline double fltlist_next_token(int * const list_end){`
`1802`	`1802`	`}`
`1803`	`1803`	`}`
`1804`	`1804`
`1805`		`-<DETMONOMIAL,POLYMONOMIAL,CLDETRATRWMONOMIAL,NDDETRATMONOMIAL,NDCLDETRATMONOMIAL>{`
	`1805`	`+<DETMONOMIAL,POLYMONOMIAL,CLDETRATRWMONOMIAL>{`
`1806`	`1806`	`{SPC}*2KappaMu2{EQL}{FLT} {`
`1807`	`1807`	`sscanf(yytext, " %[2a-zA-Z] = %lf", name, &c);`
`1808`	`1808`	`mnl->mu2 = c;`
`@@ -1815,6 +1815,14 @@ static inline double fltlist_next_token(int * const list_end){`
`1815`	`1815`	`}`
`1816`	`1816`	`}`
`1817`	`1817`
	`1818`	`+<NDDETRATMONOMIAL,NDCLDETRATMONOMIAL>{`
	`1819`	`+ {SPC}*Kappa2{EQL}{FLT} {`
	`1820`	`+ sscanf(yytext, " %[2a-zA-Z] = %lf", name, &c);`
	`1821`	`+ mnl->kappa2 = c;`
	`1822`	`+ if(myverbose) printf(" kappa2 set to %f line %d monomial %d\n", c, line_of_file, current_monomial);`
	`1823`	`+ }`
	`1824`	`+}`
	`1825`	`+`
`1818`	`1826`	`<NDCLRATMONOMIAL,CLRATMONOMIAL>{`
`1819`	`1827`	`{SPC}*AddTrLog{EQL}yes {`
`1820`	`1828`	`mnl->trlog = 1;`