naming changes for consistency

shac170 · Mar 18, 2024 · 542348d · 542348d
1 parent 86410bd
commit 542348d
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 176 deletions.
diff --git a/examples/fixed_source/slab_reed_dd/input.py b/examples/fixed_source/slab_reed_dd/input.py
@@ -46,6 +46,6 @@
 
 # Setting
 mcdc.setting(N_particle=5000)
-mcdc.domain_decomp(z=np.linspace(0.0, 8.0, 5))
+mcdc.domain_decomposition(z=np.linspace(0.0, 8.0, 5))
 # Run
 mcdc.run()
diff --git a/mcdc/__init__.py b/mcdc/__init__.py
@@ -23,7 +23,7 @@
     uq,
     print_card,
     reset_cards,
-    domain_decomp,
+    domain_decomposition,
 )
 from mcdc.main import run, prepare
 from mcdc.visualizer import visualize
diff --git a/mcdc/card.py b/mcdc/card.py
@@ -80,12 +80,12 @@ def reset(self):
             "ww": np.ones([1, 1, 1, 1]),
             "ww_width": 2.5,
             "ww_mesh": make_card_mesh(),
-            "domain_decomp": False,
-            "d_idx": 0,
-            "domain_mesh": make_card_mesh(),
-            "exchange_rate": 0,
-            "repro": False,
-            "work_ratio": np.array([1]),
+            "domain_decomposition": False,
+            "dd_idx": 0,
+            "dd_mesh": make_card_mesh(),
+            "dd_exchange_rate": 0,
+            "dd_repro": False,
+            "dd_work_ratio": np.array([1]),
             "weight_roulette": False,
             "wr_threshold": 0.0,
             "wr_survive": 1.0,

diff --git a/mcdc/input_.py b/mcdc/input_.py
@@ -1173,7 +1173,7 @@ def weight_window(x=None, y=None, z=None, t=None, window=None, width=None):
     return card
 
 
-def domain_decomp(
+def domain_decomposition(
     x=None,
     y=None,
     z=None,
@@ -1184,36 +1184,36 @@ def domain_decomp(
     repro=True,
 ):
     card = mcdc.input_deck.technique
-    card["domain_decomp"] = True
+    card["domain_decomposition"] = True
     card["domain_bank_size"] = int(1e5)
-    card["exchange_rate"] = int(exchange_rate)
-    card["repro"] = repro
+    card["dd_exchange_rate"] = int(exchange_rate)
+    card["dd_repro"] = repro
     dom_num = 1
     # Set mesh
     if x is not None:
-        card["domain_mesh"]["x"] = x
+        card["dd_mesh"]["x"] = x
         dom_num *= len(x)
     if y is not None:
-        card["domain_mesh"]["y"] = y
+        card["dd_mesh"]["y"] = y
         dom_num *= len(y)
     if z is not None:
-        card["domain_mesh"]["z"] = z
+        card["dd_mesh"]["z"] = z
         dom_num += len(z)
     if t is not None:
-        card["domain_mesh"]["t"] = t
+        card["dd_mesh"]["t"] = t
         dom_num += len(t)
     # Set work ratio
     if work_ratio is None:
-        card["work_ratio"] = None
+        card["dd_work_ratio"] = None
     elif work_ratio is not None:
-        card["work_ratio"] = work_ratio
-    card["d_idx"] = 0
-    card["xp_neigh"] = []
-    card["xn_neigh"] = []
-    card["yp_neigh"] = []
-    card["yn_neigh"] = []
-    card["zp_neigh"] = []
-    card["zn_neigh"] = []
+        card["dd_work_ratio"] = work_ratio
+    card["dd_idx"] = 0
+    card["dd_xp_neigh"] = []
+    card["dd_xn_neigh"] = []
+    card["dd_yp_neigh"] = []
+    card["dd_yn_neigh"] = []
+    card["dd_zp_neigh"] = []
+    card["dd_zn_neigh"] = []
     return card