Changeset 3797 for palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/src/create_kpp_module.C

Timestamp:

Mar 15, 2019 11:15:38 AM (5 years ago)

Author:

forkel

Message:

Modifications for OpenMP version by Klaus Ketelsen

File:

• palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/src/create_kpp_module.C (modified) (4 diffs)

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

@@ -17 +17 @@
 //-----------------
 //$Id: create_kpp_module.C 3453 2018-10-30 13:21:51Z forkel $
+// OpenMP version    (15.03.2019, ketelsen)
+//
 // Added vector switch Kacc,Krej,IERRV, Commented add_line for istatf,    (05.03.2019, forkel)
 //      added ,pe after ierr_u,         
@@ -233 +235 @@
 
    mz_kpp.add_line(" ");
+
+// Declare variables THREADPRIVATE for OpenMP version
+
+   mz_kpp.add_line("  ! OpenMP directives generated by kp4 ");
+   mz_kpp.add_line(" ");
+   mz_kpp.add_line("  !$OMP THREADPRIVATE (vl,vl_glo,is,ie,data_loaded)");
+   mz_kpp.add_line("  !$OMP THREADPRIVATE (c,var,fix,rconst,time,temp,stepmin,cfactor)");
+   mz_kpp.add_line("  !$OMP THREADPRIVATE (qvap,fakt,cs_mech,a,icntrl,rcntrl)");
+   mz_kpp.add_line(" ");
+   if(kpp_switches.is_vector()) {
+      mz_kpp.add_line("  ! Vector mode Only ");
+          mz_kpp.add_line(" ");
+          mz_kpp.add_line("  !$OMP THREADPRIVATE (kacc,krej,ierrv)");
+          mz_kpp.add_line("  !$OMP THREADPRIVATE (kpoints,kpoints_SAVE,index_org,done_check,index_step,cell_done)");
+          mz_kpp.add_line("  !$OMP THREADPRIVATE (f_done,kacc_done,krej_done,ierr_done,compress_done)");
+          mz_kpp.add_line(" ");
+   }
 
 
@@ -444 +463 @@
    }
    mz_kpp.add_line("  logical                     :: data_loaded = .false.             "); 
+   if(kpp_switches.is_vector()) {
+          mz_kpp.add_line("  REAL(dp),POINTER,DIMENSION(:,:),CONTIGUOUS    :: var           ");
+   } else {
+      mz_kpp.add_line("  REAL(dp),POINTER,DIMENSION(:),CONTIGUOUS    :: var             ");
+   }
    in.close();
 
@@ -547 +571 @@
    kppi.add_line("  if (present (rcntrl_i) )  rcntrl  = rcntrl_i                      ");
    kppi.add_line("                                                                    ");
+   if(kpp_switches.is_vector()) {
+      kppi.add_line("  var => c(:,1:nvar)                                                  ");
+   } else {
+      kppi.add_line("  var => c(1:nvar)                                                  ");
+   }
+   kppi.add_line("                                                                    ");
    kppi.add_line("  vl_glo = size(tempi,1)                                            ");
    kppi.add_line("                                                                    ");