Fix CI Tests for Langmuir_multi_1d/psatd

Author: ax3l

Examples/Tests/Langmuir/analysis_langmuir_multi.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2019 Jean-Luc Vay, Maxence Thevenet, Remi Lehe
+# Copyright 2019-2022 Jean-Luc Vay, Maxence Thevenet, Remi Lehe, Axel Huebl
 #
 #
 # This file is part of WarpX.
@@ -13,6 +13,7 @@
 # $$ E_x = \epsilon \,\frac{m_e c^2 k_x}{q_e}\sin(k_x x)\cos(k_y y)\cos(k_z z)\sin( \omega_p t)$$
 # $$ E_y = \epsilon \,\frac{m_e c^2 k_y}{q_e}\cos(k_x x)\sin(k_y y)\cos(k_z z)\sin( \omega_p t)$$
 # $$ E_z = \epsilon \,\frac{m_e c^2 k_z}{q_e}\cos(k_x x)\cos(k_y y)\sin(k_z z)\sin( \omega_p t)$$
+import os
 import re
 import sys
 
@@ -23,7 +24,6 @@
 import yt
 
 yt.funcs.mylog.setLevel(50)
-import os
 
 import numpy as np
 from scipy.constants import c, e, epsilon_0, m_e
@@ -151,8 +151,8 @@ def get_theoretical_field( field, t ):
     assert( error_rel < tolerance )
 
 if div_cleaning:
-    ds_old = yt.load('Langmuir_multi_psatd_div_cleaning_plt00038')
-    ds_mid = yt.load('Langmuir_multi_psatd_div_cleaning_plt00039')
+    ds_old = yt.load('Langmuir_multi_psatd_div_cleaning_plt000038')
+    ds_mid = yt.load('Langmuir_multi_psatd_div_cleaning_plt000039')
     ds_new = yt.load(fn) # this is the last plotfile
 
     ad_old = ds_old.covering_grid(level = 0, left_edge = ds_old.domain_left_edge, dims = ds_old.domain_dimensions)

Examples/Tests/Langmuir/analysis_langmuir_multi_1d.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2019-2021 Jean-Luc Vay, Maxence Thevenet, Remi Lehe, Prabhat Kumar
+# Copyright 2019-2022 Jean-Luc Vay, Maxence Thevenet, Remi Lehe, Prabhat Kumar, Axel Huebl
 #
 #
 # This file is part of WarpX.
@@ -11,6 +11,7 @@
 # the script `inputs.multi.rt`. This simulates a 1D periodic plasma wave.
 # The electric field in the simulation is given (in theory) by:
 # $$ E_z = \epsilon \,\frac{m_e c^2 k_z}{q_e}\sin(k_z z)\sin( \omega_p t)$$
+import os
 import re
 import sys
 
@@ -21,6 +22,7 @@
 import yt
 
 yt.funcs.mylog.setLevel(50)
+
 import numpy as np
 from scipy.constants import c, e, epsilon_0, m_e
 
@@ -75,7 +77,7 @@ def get_theoretical_field( field, t ):
 # Check the validity of the fields
 error_rel = 0
 for field in ['Ez']:
-    E_sim = data[field].to_ndarray()[:,0,0]
+    E_sim = data[('mesh',field)].to_ndarray()[:,0,0]
     E_th = get_theoretical_field(field, t0)
     max_error = abs(E_sim-E_th).max()/abs(E_th).max()
     print('%s: Max error: %.2e' %(field,max_error))
@@ -104,14 +106,14 @@ def get_theoretical_field( field, t ):
 # current correction (psatd.do_current_correction=1) is applied or when
 # Vay current deposition (algo.current_deposition=vay) is used
 if current_correction or vay_deposition:
-    rho  = data['rho' ].to_ndarray()
-    divE = data['divE'].to_ndarray()
+    rho  = data[('boxlib','rho')].to_ndarray()
+    divE = data[('boxlib','divE')].to_ndarray()
     error_rel = np.amax( np.abs( divE - rho/epsilon_0 ) ) / np.amax( np.abs( rho/epsilon_0 ) )
     tolerance = 1.e-9
     print("Check charge conservation:")
     print("error_rel = {}".format(error_rel))
     print("tolerance = {}".format(tolerance))
     assert( error_rel < tolerance )
 
-test_name = fn[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, fn)