X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fjobfiles.py;h=400a2f7e6e995b8b640219eb290251acc95093c5;hb=62d1d3edbd61f917685b94d35e36815098544e7f;hp=be88312d735de04d824c0d22338c920fb6d22c38;hpb=ae2ca9f762ec4db6c91066465f347fc3678cddae;p=django_unres.git

diff --git a/django_simple/todo/jobfiles.py b/django_simple/todo/jobfiles.py
index be88312..400a2f7 100644
--- a/django_simple/todo/jobfiles.py
+++ b/django_simple/todo/jobfiles.py
@@ -231,7 +231,7 @@ CUTOFF=7.00000 WCORR4=0.00000
         f1 = open('../files/pbs_md_new.csh', 'r') 
       f2 = open('pbs.csh', 'w')
       for line in f1:
-           f2.write(line.replace('$dimen3',str(dimen3) ))
+           f2.write(line.replace('$dimen3',str(dimen3)+' '+str(instance.md_temp) ))
       f1.close()
       f2.close()  
 
@@ -255,15 +255,18 @@ CUTOFF=7.00000 WCORR4=0.00000
         pbs = '#PBS -l nodes='+str(nodes)+':ppn=4+1:ppn='+str(reszta)
         
       tmp_ss=''
-      ix=0
-      if seq[0]=='X':
-       ix=1
       if instance.ssbond!='':
+        ix=[]
+        ii=0
+        for i in range(0,len(seq)):
+           if seq[i]=='X':
+              ii=ii+1
+           ix.append(ii)
         l=[]
         ss=json.loads(instance.ssbond)
         for e in ss:
-           l.append(e[0]-ix)
-           l.append(e[1]-ix)
+           l.append(e[0]-ix[e[0]])
+           l.append(e[1]-ix[e[1]])
         tmp_ss=' '.join(map(str,l))
 
       os.chdir(instance.jobdirname)
@@ -292,11 +295,13 @@ CUTOFF=7.00000 WCORR4=0.00000
               isampl=int(instance.md_nstep/instance.md_ntwx*nreplicas/8000)
 
           if instance.md_pdbref:
-            f.write('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
-               ' einicheck=1 rescale=2 delta=0.02 cxfile classify\n')
+            f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
+               ' einicheck=1 rescale=2 delta=0.02 cxfile classify')+'&\n')
+            f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
           else:    
-            f.write('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
-              ' einicheck=1 rescale=2 delta=0.02 cxfile\n')
+            f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
+              ' einicheck=1 rescale=2 delta=0.02 cxfile')+'&\n')
+            f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
           f.write('nres='+str(len(seq))+' one_letter\n')
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')
@@ -322,9 +327,10 @@ CUTOFF=7.00000 WCORR4=0.00000
            
       with open(instance.jobdirname+'/file_cluster.inp','w') as f:
           f.write(instance.name + ' UNRES server job'+ '\n')
-          f.write('nres='+str(len(seq))
+          f.write('{:79}'.format('nres='+str(len(seq))
              +' one_letter rescale=2 PRINT_CART PDBOUT=1 iopt=1'
-             +' temper='+str(instance.remd_cluter_temp)+'\n')
+             +' temper='+str(instance.remd_cluter_temp))+'&\n')
+          f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
           f.write(w)
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')