Changeset 3298 for palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/src/fortran_file_vec.C

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

File:

• palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/src/fortran_file_vec.C (modified) (6 diffs)

palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/src/fortran_file_vec.C

@@ -9 +9 @@
 //
 // ############################################################################
+//Current revisions:
+//------------------
+/ 
+/ 
+//Former revisions:
+//-----------------
+//$Id: fortran_file.C 2470 2017-09-14 13:56:42Z forkel $
+//  ketelsen 18.09.2018: Line 112: do k=is,ie bydo k=1,vl; line 156 ff: replaced index k by j
+//
+//  forkel Sept.2018:  added edit_Initialize
+//                     changed loop direction for update_rconst in edit_Update_RCONST
+/ 2017-09-14 13:56:42Z forkel $
+//
+//
+// Nov 2016: Intial version of KP4 adapted to PALM (Klaus Ketelsen)
+//
+
 
 #include <fstream>
@@ -77 +94 @@
     }
   }
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+      if(kpp_switches.is_vector() ) {
+          ip->global_substitute ("phot (","phot(j,");
+      }
+  }
+
   ip = pline.begin()+1 ;
   lo_line = ip->get_line() ;
   lo_line.erase();
-  lo_line = " INTEGER         :: j,k";
+  if(kpp_switches.is_vector() ) {
+    lo_line = " INTEGER         :: j,k";
+  } else {
+    lo_line = " INTEGER         :: k";
+  }
   ip->set_line(lo_line);
   
@@ -87 +115 @@
     lo_line = ip->get_line() ;
     lo_line.erase();
-    lo_line = " do k=is,ie";
+    lo_line = " do k=1,vl";
     ip->set_line(lo_line);
 
@@ -93 +121 @@
     lo_line = ip->get_line() ;
     lo_line.erase();
-    lo_line = "  j = k-is+1";
+    lo_line = "  j = k";
     ip->set_line(lo_line);
 
@@ -103 +131 @@
   } else {
     ip = pline.begin()+3 ;
+    lo_line = ip->get_line() ;
+    lo_line.erase();
+    lo_line = "  k = is";
+    ip->set_line(lo_line);
+  }
+
+  return;
+}
+
+void fortran_file::edit_Initialize (vector <Vvar> &var_list) {
+  vector<program_line>::iterator     ip;
+  vector<Vvar>::iterator             iv;
+  string                             lo_line;
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+    ip->global_substitute ("*"," *");
+    ip->global_substitute ("* *","**");
+    ip->global_substitute (","," , ");
+    ip->global_substitute ("/"," / ");
+    ip->global_substitute ("1:VL","j");
+  }
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+    for (iv=var_list.begin(); iv != var_list.end(); iv++) {
+      ip->change_variable_to_vector_g (*iv);
+    }
+  }
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+    if(kpp_switches.is_vector() ) {
+          ip->global_substitute ("qvap","qvap(j)");
+    }
+  }
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+    if(kpp_switches.is_vector() ) {
+          ip->global_substitute ("fakt","fakt(j)");
+    }
+  }
+
+  ip = pline.begin()+3 ;
+  lo_line = ip->get_line() ;
+  lo_line.erase();
+  lo_line = "  INTEGER         :: j,k";
+  ip->set_line(lo_line);
+
+  if(kpp_switches.is_vector() ) {
+    ip = pline.begin()+9 ;
+    lo_line = ip->get_line() ;
+    lo_line.erase();
+    lo_line = " do k = is,ie";
+    ip->set_line(lo_line);
+
+    ip = pline.begin()+10 ;
+    lo_line = ip->get_line() ;
+    lo_line.erase();
+    lo_line = "  j = k - is +1";
+    ip->set_line(lo_line);
+
+    ip = pline.end()-2 ;
+    lo_line = ip->get_line() ;
+//  lo_line.erase();
+    lo_line = " end do";
+    ip->set_line(lo_line);
+  } else {
+    ip = pline.begin()+7 ;
     lo_line = ip->get_line() ;
     lo_line.erase();
@@ -236 +328 @@
 }
 
+void fortran_file::edit_WAXPY () {
+
+  vector<program_line>::iterator     ip;
+
+  cout << "Handling subroutine: WAXPY" <<endl;
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+
+    if(ip->get_token(0) == "REAL") {
+       ip->substitute("N",":,:");
+       ip->substitute("N",":,:");
+       ip->substitute("Alpha","Alpha(:)");
+    } else {
+        ip->change_variable_to_vector ("Y");
+        ip->change_variable_to_vector ("X");
+        if(ip->get_token(0) != "SUBROUTINE") {
+                if(ip->get_token(0) == "IF")  {
+                        ip->substitute("Alpha","SUM(alpha(1:VL))");
+                } else {
+                        ip->substitute("Alpha","alpha(1:VL)");
+                }
+        }
+    }
+
+
+  }
+
+  return;
+}
+
+void fortran_file::edit_FunTemplate () {
+
+  vector<program_line>::iterator     ip;
+
+  cout << "Handling subroutine: FunTemplate" <<endl;
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+
+    if(ip->get_token(0) == "REAL") {
+       ip->substitute("NVAR",":,:");
+       ip->substitute("T,","T(:),");
+       ip->substitute("Told","Told(size(T)),Time(size(T))");
+    }
+
+
+  }
+
+  return;
+}
+
+void fortran_file::edit_JacTemplate () {
+
+  vector<program_line>::iterator     ip;
+
+  cout << "Handling subroutine: JacTemplate" <<endl;
+
+  for (ip=pline.begin(); ip != pline.end(); ip++) {
+
+    if(ip->get_token(0) == "REAL") {
+        ip->substitute("NVAR",":,:");
+        ip->substitute("T,","T(:),");
+        ip->substitute("Told","Told(size(T)),Time(size(T))");
+        ip->substitute("LU_NONZERO",":,:");
+    }
+
+
+  }
+
+  return;
+}
+