Changeset 3487 for palm


Ignore:
Timestamp:
Nov 5, 2018 7:18:02 AM (3 years ago)
Author:
maronga
Message:

processed comments from a previous revision, adjustments of palmrungui and palm.f90 to release 6.0

Location:
palm/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmrungui

    r2825 r3487  
    2525# -----------------
    2626# $Id$
     27# Renamed options -d and -h to -r and -c.
     28#
     29# 2825 2018-02-20 21:48:27Z maronga
    2730# Adjusted to work with newest version of palmrun
    2831#
     
    228231
    229232            if ( len(matchitems) == 0 ):
    230                 listitem = filter(None,listitem.split(" -d"))[1]
     233                listitem = filter(None,listitem.split(" -r"))[1]
    231234                listitem = filter(None,listitem.split(" -"))[0]
    232235                listitem = listitem.replace(" ","");
     
    277280
    278281            # Change palmrunline accordingly
    279             self.change_commandline("d","")
     282            self.change_commandline("r","")
    280283            self.change_commandline("a","")
    281284            return
     
    311314        while i>=1:
    312315            listitem = history[i-1][17:len(history[i-1])-1]
    313             listitem = filter(None,listitem.split(" -d"))[1]
     316            listitem = filter(None,listitem.split(" -r"))[1]
    314317            listitem = filter(None,listitem.split(" -"))[0]
    315318            listitem = listitem.replace(" ","");               
     
    342345   
    343346        if ( drop_job == "Restart run" or drop_job == "Restart run (coupled atmosphere ocean)"):
    344            self.change_commandline("d","")
     347           self.change_commandline("r","")
    345348
    346349        # Check of ocean runs
     
    371374        param = splitline[1].split("-")
    372375   
    373         # Change in parameter "d" (jobname)
    374         if (id_str == "d"):
     376        # Change in parameter "r" (jobname)
     377        if (id_str == "r"):
    375378            filename = str(self.group_job.findChild(QtGui.QLineEdit,"line_jobname").text())
    376379            s = filename.split("JOBS/")
     
    390393                self.menuBar.findChild(QtGui.QMenu,"menuStart").actions()[3].setEnabled(False)
    391394                self.group_advanced.setEnabled(False)
    392                 self.delete_commandline("d")
     395                self.delete_commandline("r")
    393396                self.change_commandline("a","remove")
    394397                self.group_job.findChild(QtGui.QLabel,"label_usercode").setText("")
     
    535538        if ( self.sender() == self.group_execution.findChild(QtGui.QLineEdit, "line_host") ):
    536539            tmptext = self.group_execution.findChild(QtGui.QLineEdit,"line_host").text()
    537             self.change_commandline("h",tmptext)
     540            self.change_commandline("c",tmptext)
    538541
    539542        elif ( self.sender() == self.group_job.findChild(QtGui.QLineEdit, "line_jobname") ):
    540543            tmptext = self.group_job.findChild(QtGui.QLineEdit,"line_jobname").text()
    541             self.change_commandline("d",tmptext)
     544            self.change_commandline("r",tmptext)
    542545
    543546        elif ( self.sender() == self.group_execution.findChild(QtGui.QLineEdit,"line_q")):
     
    820823
    821824            # Check for suitable switch
    822             if ( parameter == "d"):
     825            if ( parameter == "r"):
    823826             
    824827                if ( options != ""):
     
    829832                    nojob = True
    830833               
    831             elif ( parameter == "h"):
     834            elif ( parameter == "c"):
    832835                self.group_execution.findChild(QtGui.QLineEdit,"line_host").setText(options)
    833836             
  • palm/trunk/SOURCE/palm.f90

    r3484 r3487  
    2525! -----------------
    2626! $Id$
     27! Updates version to 6.0
     28!
     29! 3484 2018-11-02 14:41:25Z hellstea
    2730! pmci_ensure_nest_mass_conservation removed permanently
    2831!
     
    324327    INTEGER(iwp)     ::  i               !< loop counter for blocked I/O
    325328
    326     version = 'PALM 5.0'
     329    version = 'PALM 6.0'
    327330    user_interface_required_revision = 'r3240'
    328331
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_passive/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_passive1/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_phstat/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_simple/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_simplep/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_smog/chem_gasphase_mod.f90

    r3458 r3487  
    4646! Current revisions:
    4747! ------------------
    48 ! forkel June 2018: qvap,fakt added
    49 ! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
    5048!
    5149!
     
    5351! -----------------
    5452! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $
     53! forkel June 2018: qvap,fakt added
     54! forkel June 2018: reset case in  Initialize,Integrate,Update_rconst
     55!
     56!
     57! 2460 2017-09-13 14:47:48Z forkel
    5558!
    5659! forkel Sept. 2017: Variables for photolyis added
  • palm/trunk/UTIL/chemistry/gasphase_preproc/run_kpp4palm.ksh

    r3458 r3487  
    2424# Current revisions:
    2525# ------------------
    26 # Some correctetion of comments
     26#
    2727#
    2828# Former revisions:
    2929# -----------------
    3030# $Id$
     31# Some correctetion of comments
     32#
     33# 3458 2018-10-30 14:51:23Z kanani
    3134#  passed $MECH insted of $DEFDIR to kpp4palm.ksh                   forkel  25. Sept. 2018
    3235#  re-activaded  choice of deindexing method and vector mode        forkel  June 2018
Note: See TracChangeset for help on using the changeset viewer.