Ignore:
Timestamp:
Oct 30, 2018 2:51:23 PM (4 years ago)
Author:
kanani
Message:

Reintegrated fixes/changes from branch chemistry

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/UTIL/chemistry/gasphase_preproc/kpp4palm/bin/kpp4palm.ksh

    r3298 r3458  
    4040# -----------------
    4141# $Id$
     42# forkel   30. Oktober 2018: Integrating contents of kp4_compress into chem_gasphase_mod.f90
    4243# forkel   25. September 2018: Added cat for $MECH to pass mechanism name to kpp4palm
    4344# ketelsen 18. September 2018: Added cat for '#INLINE F90_GLOBAL'
     
    121122      k)   KEEP="YES";;              # keep Working directory
    122123
    123       o)   OUTDIR=$OPTARG;;          # Output directory of Generated Code
    124 
    125       p)   PREFIX=$OPTARG;;          # Name Prefix
    126 
    127       s)   KPP_SOLVER=$OPTARG;;      # Update sample f90 code in the def_MECH directory
    128 
    129       u)   UPDT="YES";;              # keep Working directory
     124      o)   OUTDIR=$OPTARG;;          # Output directory of Generated Code =
     125                                     # SOURCE directory (do not change)
     126
     127      p)   PREFIX=$OPTARG;;          # Name Prefix (chem_gasphase_mod, do not change)
     128
     129      s)   KPP_SOLVER=$OPTARG;;      # Chosen solver (only Rosebrock solvers work for vector mode)
     130
     131      u)   UPDT="YES";;              # update mechanisms/def_$MECH/chem_gasphase_mod.f90
    130132
    131133      v)   MODE="vector";;           # Set to vector Mode
     
    163165
    164166KPP_FILE_LIST="Initialize Integrator LinearAlgebra Jacobian Function Rates Util"
    165 
     167if [[ $MODE = "vector" ]]
     168 then
     169KPP_FILE_LIST="$KPP_FILE_LIST kp4_compress_subroutines"
     170fi
    166171
    167172KPP_SUBROUTINE_LIST="Initialize"
     
    189194   # get vector Solver
    190195   cp $BASE/templates/${KPP_SOLVER}_vec.f90 ${KPP_SOLVER}.f90
     196   cp $BASE/templates/kp4_compress_header ${PREFIX}_kp4_compress_header.f90
     197   cp $BASE/templates/kp4_compress_subroutines ${PREFIX}_kp4_compress_subroutines.f90
    191198fi
    192199
     
    207214         KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST Rosenbrock  FunTemplate JacTemplate"
    208215        KPP_INTERFACE_IGNORE="WAXPY"
     216
    209217      else
    210218        KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST FunTemplate JacTemplate"
     219        KPP_SUBROUTINE_LIST="$KPP_SUBROUTINE_LIST kco_initialize kco_compress kco_finalize"
    211220      fi;;
    212221
     
    246255
    247256KPP_INCLUDE_LIST="Parameters Global JacobianSP Monitor"
     257if [[ $MODE = "vector" ]]
     258 then
     259KPP_INCLUDE_LIST="$KPP_INCLUDE_LIST kp4_compress_header"
     260fi
    248261
    249262#Get definition Files
     
    309322done
    310323
    311 echo start kp4.exe with arguments
     324echo start kpp4palm.exe with arguments
    312325echo $PREFIX $MODE $VLEN $DE_INDEX $DE_INDEX_FAST
    313326
Note: See TracChangeset for help on using the changeset viewer.