further benchmark for 2D up to the 3rd order

Author: kunyuan

inlist

@@ -1,4 +1,4 @@
-25 1.0 1.0 3.0  101 0 8
+20 1.0 1.0 3.0  101 0 16
 
 10 1.0 1.0 10.0 101 1 8
 # Beta, rs, Mass2, MaxExtMom(*kF), TotalStep(*1e6), Observable, Duplication

polar_freq.py

@@ -9,7 +9,7 @@
 
 rs=1.0
 Lambda=1.0
-Beta=10
+Beta=20
 
 ##############   3D    ##################################
 # kF=(9.0*np.pi/4.0)**(1.0/3.0)/rs #3D
@@ -25,7 +25,7 @@
 ###### Bare Green's function    #########################
 kF=np.sqrt(2.0)/rs #2D
 # Bubble=0.11635  #2D, Beta=0.5, rs=1
-Bubble=0.15916/2.0  #2D, Beta=10, rs=1
+Bubble=0.15916  #2D, Beta=10, rs=1
 
 ScanOrder=[1,2,3]
 # ScanOrder=[3]
@@ -40,8 +40,7 @@
 Normalization=1
 
 
-# folder="./".format(Beta, rs, Lambda) 
-folder="./" 
+folder="./Beta{0}_rs{1}_lambda{2}_freq/".format(Beta, rs, Lambda) 
 
 files=os.listdir(folder)
 for order in ScanOrder:

send.py

@@ -7,21 +7,11 @@
 Cluster="local"
 # Cluster="condor"
 
-compiler="ifort"
-# compiler="gfortran"
-
-execute="feyncalc"
 ############################################
 
-sourcedir=os.getcwd()
-filelist=os.listdir(sourcedir)
-sourcename=[elem for elem in filelist if elem[0:len(execute)]==execute and elem[-3:]=="f90"]
-print sourcename
-sourcename.sort()
-sourcename=sourcename[-1]
-
-tothomedir=os.getcwd()
-inlist=open(tothomedir+"/inlist","r")
+rootdir=os.getcwd()
+inlist=open(rootdir+"/inlist","r")
+execute="feyncalc.exe"
 
 for index, eachline in enumerate(inlist):
         para=eachline.split()
@@ -44,7 +34,7 @@
 
         os.system("cp DiagPolar*.txt "+homedir)
         os.system("cp DiagLoop*.txt "+homedir)
-        os.system(compiler+" "+sourcedir+"/"+sourcename+" -O3 -o "+homedir+"/"+execute)
+        os.system("cp {0} {1}".format(execute, homedir))
 
         infilepath=homedir+"/infile"
         if(os.path.exists(infilepath)!=True):
@@ -55,8 +45,6 @@
         jobfilepath=homedir+"/jobfile"
         if(os.path.exists(jobfilepath)!=True):
             os.system("mkdir "+jobfilepath)
-        if(os.path.exists(homedir+"/Data")!=True):
-            os.system("mkdir "+homedir+"/Data")
 
         for pid in range(int(para[-1])):
 

src/markov.cpp

@@ -138,14 +138,20 @@ void markov::Initialization(string FilePrefix) {
   ///=== Do all kinds of test  =======================//
   Weight.StaticTest();
   Weight.DynamicTest();
+
+  ///==== Set Reweighting factor =====================//
+  AdjustGroupReWeight();
 }
 
-void markov::AdjustGroupReWeight(){};
+void markov::AdjustGroupReWeight() {
+  double factor[3] = {1.0, 1.0, 10.0};
+  for (int i = 0; i < Weight.Groups.size(); i++)
+    Weight.Groups[i].ReWeight = factor[i];
+};
 
 void markov::Measure() {
-  double AbsWeight = fabs(Var.CurrGroup->Weight);
-  double WeightFactor =
-      Var.CurrGroup->Weight / AbsWeight / Var.CurrGroup->ReWeight;
+  double MCWeight = fabs(Var.CurrGroup->Weight) * Var.CurrGroup->ReWeight;
+  double WeightFactor = Var.CurrGroup->Weight / MCWeight;
   Polar[Var.CurrGroup->ID][Var.CurrExtMomBin] += WeightFactor;
   PolarStatic[Var.CurrGroup->ID] += WeightFactor;
 };
@@ -207,8 +213,10 @@ void markov::IncreaseOrder() {
   COPYFROMTO(NewMom, Var.LoopMom[NewLoopIndex]);
 
   Weight.ChangeGroup(NewGroup);
-  double NewWeight = Weight.GetNewWeight(NewGroup);
-  double R = Prop * fabs(NewWeight) / fabs(Var.CurrGroup->Weight);
+  double NewWeight = Weight.GetNewWeight(NewGroup) * NewGroup.ReWeight;
+  double R = Prop * fabs(NewWeight) / fabs(Var.CurrGroup->Weight) /
+             Var.CurrGroup->ReWeight;
+
   if (Random.urn() < R) {
     Accepted[INCREASE_ORDER][Var.CurrGroup->ID]++;
     Weight.AcceptChange(NewGroup);
@@ -231,8 +239,10 @@ void markov::DecreaseOrder() {
   Prop *= RemoveOldK(Var.LoopMom[LoopToRemove]);
 
   Weight.ChangeGroup(NewGroup);
-  double NewWeight = Weight.GetNewWeight(NewGroup);
-  double R = Prop * fabs(NewWeight) / fabs(Var.CurrGroup->Weight);
+  double NewWeight = Weight.GetNewWeight(NewGroup) * NewGroup.ReWeight;
+  double R = Prop * fabs(NewWeight) / fabs(Var.CurrGroup->Weight) /
+             Var.CurrGroup->ReWeight;
+
   if (Random.urn() < R) {
     Accepted[DECREASE_ORDER][Var.CurrGroup->ID]++;
     Weight.AcceptChange(NewGroup);