diff --git a/python/MS_helper_functions.py b/python/MS_helper_functions.py index a020383498f4c71e1e84eb0224b5db0894195042..aff1efc2f5af59b59cce52a09a7823bd4f70f373 100644 --- a/python/MS_helper_functions.py +++ b/python/MS_helper_functions.py @@ -1054,9 +1054,9 @@ class cl_MS(): # mu_hyst from myPackage import diagCF tmp = diagCF(tmp, dim=lambda_bar.dims[0]) - elif lambda_bar.dim != tmp.dim: - # B for 3x2 VPM - tmp = CF((tmp[0], tmp[1])) + # elif lambda_bar.dim != tmp.dim: + # # B for 3x2 VPM + # tmp = CF((tmp[0], tmp[1])) else: #B tmp = tmp#CF((tmp,)*lambda_bar.dims[0]) @@ -1200,8 +1200,8 @@ class cl_MS(): # boundary terms ret += InnerProduct(self.coupling_map[phi_i][phi_j] * terms_u[i][0] * specialcf.normal(self.dim), terms_v[j][0] * specialcf.normal(self.dim)) else: - if (self.is2D1D and hasattr(self.coupling_map[phi_i][phi_j], "dims") and len(self.coupling_map[phi_i][phi_j].dims)> 0) or \ - (hasattr(self.coupling_map[phi_i][phi_j], "dims") and hasattr(terms_u[i][0], "dims") and self.coupling_map[phi_i][phi_j].dims[0] != terms_u[i][0].dim): + if (self.is2D1D and hasattr(self.coupling_map[phi_i][phi_j], "dims") and len(self.coupling_map[phi_i][phi_j].dims)> 0) :#or \ + #(hasattr(self.coupling_map[phi_i][phi_j], "dims") and hasattr(terms_u[i][0], "dims") and self.coupling_map[phi_i][phi_j].dims[0] != terms_u[i][0].dim): # 2D1D or 3x2 tmp = self.coupling_map[phi_i][phi_j] if len(self.coupling_map[phi_i][phi_j].dims) == 2: