Changeset 3458 for palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/bin

Timestamp:

Oct 30, 2018 2:51:23 PM (6 years ago)

Author:

kanani

Message:

Reintegrated fixes/changes from branch chemistry

File:

• palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/bin/kpp4palm.ksh (modified) (7 diffs)

palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/bin/kpp4palm.ksh

@@ -40 +40 @@
 # -----------------
 # $Id$ 
+# forkel   30. Oktober 2018: Integrating contents of kp4_compress into chem_gasphase_mod.f90
 # forkel   25. September 2018: Added cat for $MECH to pass mechanism name to kpp4palm
 # ketelsen 18. September 2018: Added cat for '#INLINE F90_GLOBAL' 
@@ -121 +122 @@
       k)   KEEP="YES";;              # keep Working directory
 
-      o)   OUTDIR=$OPTARG;;          # Output directory of Generated Code
-
-      p)   PREFIX=$OPTARG;;          # Name Prefix
-
-      s)   KPP_SOLVER=$OPTARG;;      # Update sample f90 code in the def_MECH directory
-
-      u)   UPDT="YES";;              # keep Working directory
+      o)   OUTDIR=$OPTARG;;          # Output directory of Generated Code = 
+                                     # SOURCE directory (do not change)
+
+      p)   PREFIX=$OPTARG;;          # Name Prefix (chem_gasphase_mod, do not change)
+
+      s)   KPP_SOLVER=$OPTARG;;      # Chosen solver (only Rosebrock solvers work for vector mode)
+
+      u)   UPDT="YES";;              # update mechanisms/def_$MECH/chem_gasphase_mod.f90
 
       v)   MODE="vector";;           # Set to vector Mode
@@ -163 +165 @@
 
 KPP_FILE_LIST="Initialize Integrator LinearAlgebra Jacobian Function Rates Util"
-
+if [[ $MODE = "vector" ]]
+ then
+KPP_FILE_LIST="$KPP_FILE_LIST kp4_compress_subroutines"
+fi
 
 KPP_SUBROUTINE_LIST="Initialize"
@@ -189 +194 @@
    # get vector Solver 
    cp $BASE/templates/${KPP_SOLVER}_vec.f90 ${KPP_SOLVER}.f90
+   cp $BASE/templates/kp4_compress_header ${PREFIX}_kp4_compress_header.f90
+   cp $BASE/templates/kp4_compress_subroutines ${PREFIX}_kp4_compress_subroutines.f90
 fi
 
@@ -207 +214 @@
          KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST Rosenbrock  FunTemplate JacTemplate"
         KPP_INTERFACE_IGNORE="WAXPY"
+
       else 
         KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST FunTemplate JacTemplate"
+        KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST kco_initialize kco_compress kco_finalize"
       fi;;
 
@@ -246 +255 @@
 
 KPP_INCLUDE_LIST="Parameters Global JacobianSP Monitor"
+if [[ $MODE = "vector" ]]
+ then
+KPP_INCLUDE_LIST="$KPP_INCLUDE_LIST kp4_compress_header"
+fi
 
 #Get definition Files
@@ -309 +322 @@
 done
 
-echo start kp4.exe with arguments
+echo start kpp4palm.exe with arguments
 echo $PREFIX $MODE $VLEN $DE_INDEX $DE_INDEX_FAST