removing spaces in the configs (#60)

ergodicio · Aug 15, 2024 · f58abd6 · f58abd6
1 parent 3e947ee
commit f58abd6
Show file tree

Hide file tree

Showing 35 changed files with 79 additions and 79 deletions.
diff --git a/adept/lpse2d/helpers.py b/adept/lpse2d/helpers.py
@@ -38,7 +38,7 @@ def write_units(cfg: Dict) -> Dict:
     Ti = _Q(cfg["units"]["reference ion temperature"]).to("keV").value
     Z = cfg["units"]["ionization state"]
     A = cfg["units"]["atomic number"]
-    lam0 = _Q(cfg["units"]["laser wavelength"]).to("um").value
+    lam0 = _Q(cfg["units"]["laser_wavelength"]).to("um").value
     I0 = (
         _Q(cfg["units"]["laser intensity"]).to("W/cm^2").value / 2
     )  ## NB - the factor of 2 enables matching to the Short scaling

diff --git a/adept/sh2d/runner.py b/adept/sh2d/runner.py
@@ -16,7 +16,7 @@ def write_units(cfg, td):
     ureg = pint.UnitRegistry()
     _Q = ureg.Quantity
 
-    lambda0 = _Q(cfg["units"]["laser wavelength"])
+    lambda0 = _Q(cfg["units"]["laser_wavelength"])
     w0 = (2 * np.pi / lambda0 * ureg.c).to("rad/s")
     t0 = (1 / w0).to("fs")
     n0 = (w0**2 * ureg.m_e * ureg.epsilon_0 / ureg.e**2.0).to("1/cc")

diff --git a/adept/tf1d/base.py b/adept/tf1d/base.py
@@ -50,8 +50,8 @@ def write_units(self):
         """
         _Q = self.ureg.Quantity
 
-        n0 = _Q(self.cfg["units"]["normalizing density"]).to("1/cc")
-        T0 = _Q(self.cfg["units"]["normalizing temperature"]).to("eV")
+        n0 = _Q(self.cfg["units"]["normalizing_density"]).to("1/cc")
+        T0 = _Q(self.cfg["units"]["normalizing_temperature"]).to("eV")
 
         wp0 = np.sqrt(n0 * self.ureg.e**2.0 / (self.ureg.m_e * self.ureg.epsilon_0)).to("rad/s")
         tp0 = (1 / wp0).to("fs")

diff --git a/adept/tf1d/helpers.py b/adept/tf1d/helpers.py
@@ -29,8 +29,8 @@ def write_units(cfg: Dict, td: str) -> Dict:
     ureg = pint.UnitRegistry()
     _Q = ureg.Quantity
 
-    n0 = _Q(cfg["units"]["normalizing density"]).to("1/cc")
-    T0 = _Q(cfg["units"]["normalizing temperature"]).to("eV")
+    n0 = _Q(cfg["units"]["normalizing_density"]).to("1/cc")
+    T0 = _Q(cfg["units"]["normalizing_temperature"]).to("eV")
 
     wp0 = np.sqrt(n0 * ureg.e**2.0 / (ureg.m_e * ureg.epsilon_0)).to("rad/s")
     tp0 = (1 / wp0).to("fs")

diff --git a/adept/vlasov1d/base.py b/adept/vlasov1d/base.py
@@ -26,8 +26,8 @@ def write_units(self) -> Dict:
 
         _Q = self.ureg.Quantity
 
-        n0 = _Q(self.cfg["units"]["normalizing density"]).to("1/cc")
-        T0 = _Q(self.cfg["units"]["normalizing temperature"]).to("eV")
+        n0 = _Q(self.cfg["units"]["normalizing_density"]).to("1/cc")
+        T0 = _Q(self.cfg["units"]["normalizing_temperature"]).to("eV")
 
         wp0 = np.sqrt(n0 * self.ureg.e**2.0 / (self.ureg.m_e * self.ureg.epsilon_0)).to("rad/s")
         tp0 = (1 / wp0).to("fs")

diff --git a/adept/vlasov2d/helpers.py b/adept/vlasov2d/helpers.py
@@ -33,8 +33,8 @@ def write_units(cfg, td):
     ureg = pint.UnitRegistry()
     _Q = ureg.Quantity
 
-    n0 = _Q(cfg["units"]["normalizing density"]).to("1/cc")
-    T0 = _Q(cfg["units"]["normalizing temperature"]).to("eV")
+    n0 = _Q(cfg["units"]["normalizing_density"]).to("1/cc")
+    T0 = _Q(cfg["units"]["normalizing_temperature"]).to("eV")
 
     wp0 = np.sqrt(n0 * ureg.e**2.0 / (ureg.m_e * ureg.epsilon_0)).to("rad/s")
     tp0 = (1 / wp0).to("fs")

diff --git a/configs/envelope-2d/damping.yaml b/configs/envelope-2d/damping.yaml
@@ -54,9 +54,9 @@ models:
       out_size: 1
       width_size: 8
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/envelope-2d/epw.yaml b/configs/envelope-2d/epw.yaml
@@ -65,7 +65,7 @@ units:
   envelope density: 0.25
   ionization state: 6
   laser intensity: 3.5e+14W/cm^2
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 2000.0eV
   reference ion temperature: 1000eV
 
diff --git a/configs/envelope-2d/reflection.yaml b/configs/envelope-2d/reflection.yaml
@@ -52,9 +52,9 @@ plasma:
 #  density: 2.3e27  #m^3
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 4000eV
-  normalizing density: 2.24e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 4000eV
+  normalizing_density: 2.24e21/cc
   gas fill: N
   ionization state: 6
   electron temperature: 4000eV

diff --git a/configs/envelope-2d/tpd-opt.yaml b/configs/envelope-2d/tpd-opt.yaml
@@ -69,6 +69,6 @@ units:
   envelope density: 0.25
   ionization state: 6
   laser intensity: 2.0e+15W/cm^2
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 2000.0eV
   reference ion temperature: 1000eV
diff --git a/configs/envelope-2d/tpd.yaml b/configs/envelope-2d/tpd.yaml
@@ -68,6 +68,6 @@ units:
   envelope density: 0.25
   ionization state: 6
   laser intensity: 2.0e+14W/cm^2
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 2000.0eV
   reference ion temperature: 1000eV
diff --git a/configs/sh2d/landau_damping.yaml b/configs/sh2d/landau_damping.yaml
@@ -5,7 +5,7 @@ mlflow:
   run: test
 
 units:
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   electron temperature: 2000eV
   density for collisions: 1.5e21/cc
   Z: 10

diff --git a/configs/tf-1d/damping.yaml b/configs/tf-1d/damping.yaml
@@ -15,9 +15,9 @@ models:
       width_size: 8
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/tf-1d/epw.yaml b/configs/tf-1d/epw.yaml
@@ -67,8 +67,8 @@ save:
     xmin: 0.0
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
diff --git a/configs/tf-1d/tf1d.yaml b/configs/tf-1d/tf1d.yaml
@@ -93,8 +93,8 @@ drivers:
       "a0": 0.e-2
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
diff --git a/configs/tf-1d/wp.yaml b/configs/tf-1d/wp.yaml
@@ -75,8 +75,8 @@ save:
     xmin: 0.0
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
diff --git a/configs/vfp-1d/epp-short.yaml b/configs/vfp-1d/epp-short.yaml
@@ -1,5 +1,5 @@
 units:
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 300eV
   reference ion temperature: 300eV
   reference electron density: 1.5e21/cm^3

diff --git a/configs/vfp-1d/hotspot.yaml b/configs/vfp-1d/hotspot.yaml
@@ -1,5 +1,5 @@
 units:
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 500eV
   reference ion temperature: 500eV
   reference electron density: 1.5e21/cm^3

diff --git a/configs/vlasov-1d/bump-on-tail.yaml b/configs/vlasov-1d/bump-on-tail.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-1d/epw.yaml b/configs/vlasov-1d/epw.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-1d/nlepw-ic.yaml b/configs/vlasov-1d/nlepw-ic.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-1d/srs.yaml b/configs/vlasov-1d/srs.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-1d/twostream.yaml b/configs/vlasov-1d/twostream.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-1d/wavepacket.yaml b/configs/vlasov-1d/wavepacket.yaml
@@ -99,6 +99,6 @@ terms:
 units:
   Z: 10
   Zp: 10
-  laser wavelength: 351nm
-  normalizing density: 1.5e21/cc
-  normalizing temperature: 2000eV
+  laser_wavelength: 351nm
+  normalizing_density: 1.5e21/cc
+  normalizing_temperature: 2000eV
diff --git a/configs/vlasov-1d2v/epw.yaml b/configs/vlasov-1d2v/epw.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/configs/vlasov-2d/base.yaml b/configs/vlasov-2d/base.yaml
@@ -1,9 +1,9 @@
 calculator_machine: s-t4
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_lpse2d/configs/epw.yaml b/tests/test_lpse2d/configs/epw.yaml
@@ -65,7 +65,7 @@ units:
   envelope density: 0.25
   ionization state: 6
   laser intensity: 3.5e+14W/cm^2
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 2000.0eV
   reference ion temperature: 1000eV
 
diff --git a/tests/test_lpse2d/configs/resonance_search.yaml b/tests/test_lpse2d/configs/resonance_search.yaml
@@ -54,9 +54,9 @@ plasma:
   density: 2.3e27  #m^3
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_lpse2d/configs/tpd.yaml b/tests/test_lpse2d/configs/tpd.yaml
@@ -68,6 +68,6 @@ units:
   envelope density: 0.25
   ionization state: 6
   laser intensity: 2.0e+14W/cm^2
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 2000.0eV
   reference ion temperature: 1000eV
diff --git a/tests/test_tf1d/configs/resonance.yaml b/tests/test_tf1d/configs/resonance.yaml
@@ -14,9 +14,9 @@ grid:
 models: False
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_tf1d/configs/resonance_search.yaml b/tests/test_tf1d/configs/resonance_search.yaml
@@ -7,9 +7,9 @@ mlflow:
 adjoint: Backsolve
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_tf1d/configs/vlasov_comparison.yaml b/tests/test_tf1d/configs/vlasov_comparison.yaml
@@ -14,9 +14,9 @@ grid:
     tmax: 50
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_vfp1d/epp-short.yaml b/tests/test_vfp1d/epp-short.yaml
@@ -1,5 +1,5 @@
 units:
-  laser wavelength: 351nm
+  laser_wavelength: 351nm
   reference electron temperature: 300eV
   reference ion temperature: 300eV
   reference electron density: 1.5e21/cm^3

diff --git a/tests/test_vlasov1d/configs/resonance.yaml b/tests/test_vlasov1d/configs/resonance.yaml
@@ -1,7 +1,7 @@
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10
 

diff --git a/tests/test_vlasov2d/configs/damping.yaml b/tests/test_vlasov2d/configs/damping.yaml
@@ -1,9 +1,9 @@
 calculator_machine: s-t4
 
 units:
-  laser wavelength: 351nm
-  normalizing temperature: 2000eV
-  normalizing density: 1.5e21/cc
+  laser_wavelength: 351nm
+  normalizing_temperature: 2000eV
+  normalizing_density: 1.5e21/cc
   Z: 10
   Zp: 10