Changeset 3487 for palm/trunk
- Timestamp:
- Nov 5, 2018 7:18:02 AM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/palmrungui
r2825 r3487 25 25 # ----------------- 26 26 # $Id$ 27 # Renamed options -d and -h to -r and -c. 28 # 29 # 2825 2018-02-20 21:48:27Z maronga 27 30 # Adjusted to work with newest version of palmrun 28 31 # … … 228 231 229 232 if ( len(matchitems) == 0 ): 230 listitem = filter(None,listitem.split(" - d"))[1]233 listitem = filter(None,listitem.split(" -r"))[1] 231 234 listitem = filter(None,listitem.split(" -"))[0] 232 235 listitem = listitem.replace(" ",""); … … 277 280 278 281 # Change palmrunline accordingly 279 self.change_commandline(" d","")282 self.change_commandline("r","") 280 283 self.change_commandline("a","") 281 284 return … … 311 314 while i>=1: 312 315 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] 314 317 listitem = filter(None,listitem.split(" -"))[0] 315 318 listitem = listitem.replace(" ",""); … … 342 345 343 346 if ( drop_job == "Restart run" or drop_job == "Restart run (coupled atmosphere ocean)"): 344 self.change_commandline(" d","")347 self.change_commandline("r","") 345 348 346 349 # Check of ocean runs … … 371 374 param = splitline[1].split("-") 372 375 373 # Change in parameter " d" (jobname)374 if (id_str == " d"):376 # Change in parameter "r" (jobname) 377 if (id_str == "r"): 375 378 filename = str(self.group_job.findChild(QtGui.QLineEdit,"line_jobname").text()) 376 379 s = filename.split("JOBS/") … … 390 393 self.menuBar.findChild(QtGui.QMenu,"menuStart").actions()[3].setEnabled(False) 391 394 self.group_advanced.setEnabled(False) 392 self.delete_commandline(" d")395 self.delete_commandline("r") 393 396 self.change_commandline("a","remove") 394 397 self.group_job.findChild(QtGui.QLabel,"label_usercode").setText("") … … 535 538 if ( self.sender() == self.group_execution.findChild(QtGui.QLineEdit, "line_host") ): 536 539 tmptext = self.group_execution.findChild(QtGui.QLineEdit,"line_host").text() 537 self.change_commandline(" h",tmptext)540 self.change_commandline("c",tmptext) 538 541 539 542 elif ( self.sender() == self.group_job.findChild(QtGui.QLineEdit, "line_jobname") ): 540 543 tmptext = self.group_job.findChild(QtGui.QLineEdit,"line_jobname").text() 541 self.change_commandline(" d",tmptext)544 self.change_commandline("r",tmptext) 542 545 543 546 elif ( self.sender() == self.group_execution.findChild(QtGui.QLineEdit,"line_q")): … … 820 823 821 824 # Check for suitable switch 822 if ( parameter == " d"):825 if ( parameter == "r"): 823 826 824 827 if ( options != ""): … … 829 832 nojob = True 830 833 831 elif ( parameter == " h"):834 elif ( parameter == "c"): 832 835 self.group_execution.findChild(QtGui.QLineEdit,"line_host").setText(options) 833 836 -
palm/trunk/SOURCE/palm.f90
r3484 r3487 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Updates version to 6.0 28 ! 29 ! 3484 2018-11-02 14:41:25Z hellstea 27 30 ! pmci_ensure_nest_mass_conservation removed permanently 28 31 ! … … 324 327 INTEGER(iwp) :: i !< loop counter for blocked I/O 325 328 326 version = 'PALM 5.0'329 version = 'PALM 6.0' 327 330 user_interface_required_revision = 'r3240' 328 331 -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_passive/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_passive1/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_phstat/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_simple/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_simplep/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/mechanisms/def_smog/chem_gasphase_mod.f90
r3458 r3487 46 46 ! Current revisions: 47 47 ! ------------------ 48 ! forkel June 2018: qvap,fakt added49 ! forkel June 2018: reset case in Initialize,Integrate,Update_rconst50 48 ! 51 49 ! … … 53 51 ! ----------------- 54 52 ! $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 55 58 ! 56 59 ! forkel Sept. 2017: Variables for photolyis added -
palm/trunk/UTIL/chemistry/gasphase_preproc/run_kpp4palm.ksh
r3458 r3487 24 24 # Current revisions: 25 25 # ------------------ 26 # Some correctetion of comments26 # 27 27 # 28 28 # Former revisions: 29 29 # ----------------- 30 30 # $Id$ 31 # Some correctetion of comments 32 # 33 # 3458 2018-10-30 14:51:23Z kanani 31 34 # passed $MECH insted of $DEFDIR to kpp4palm.ksh forkel 25. Sept. 2018 32 35 # re-activaded choice of deindexing method and vector mode forkel June 2018
Note: See TracChangeset
for help on using the changeset viewer.