Merge pull request #36 from regro-cf-autotick-bot/22.01_hbc2656

warpx v22.01
conda-forge · Jan 6, 2022 · 5da86ba · 5da86ba
2 parents 5f866b0 + 361bb01
commit 5da86ba
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = "warpx" %}
-{% set version = "21.12" %}
-{% set build = 1 %}
-{% set sha256 = "847c98aac20c73d94c823378803c82be9a14139f1c14ea483757229b452ce4c1" %}
+{% set version = "22.01" %}
+{% set build = 0 %}
+{% set sha256 = "e465ffadabb7dc360c63c4d3862dc08082b5b0e77923d3fb05570408748b0d28" %}
 
 package:
   name: {{ name|lower }}
@@ -10,10 +10,6 @@ package:
 source:
   url: https://github.com/ECP-WarpX/WarpX/archive/{{ version }}.tar.gz
   sha256: {{ sha256 }}
-  patches:
-    # The symbolic aliases for our +lib target were missing in the install location
-    # https://github.com/ECP-WarpX/WarpX/pull/2626
-    - 2626.patch
 
 build:
   number: {{ build }}
@@ -57,13 +53,14 @@ requirements:
   run:
     - numpy
     - periodictable
-    - picmistandard ==0.0.16
+    - picmistandard ==0.0.18
     - python
     - scipy
 
 test:
   source_files:
     - Examples/Physics_applications/laser_acceleration/inputs_*
+    - Examples/Physics_applications/laser_acceleration/PICMI_inputs_*
   files:
     - test.sh   # [unix]
     - test.bat  # [win]

diff --git a/recipe/test.bat b/recipe/test.bat
@@ -11,12 +11,26 @@ if errorlevel 1 exit 1
 warpx.2d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_2d max_step=50 diag1.intervals=10 diag1.format=openpmd
 if errorlevel 1 exit 1
 
-:: 1D - input in 22.01+
-::warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd
-::if errorlevel 1 exit 1
+:: 1D
+warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd
+if errorlevel 1 exit 1
 
 :: RZ
-warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_2d_rz max_step=50 diag1.intervals=10 diag1.format=openpmd
+warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED.exe %TEST_DIR%\inputs_rz max_step=50 diag1.intervals=10 diag1.format=openpmd
+if errorlevel 1 exit 1
+
+:: Python: 3D
+%PYTHON% %TEST_DIR%\PICMI_inputs_3d.py
+if errorlevel 1 exit 1
+
+:: Python: 2D
+%PYTHON% %TEST_DIR%\PICMI_inputs_2d.py
+if errorlevel 1 exit 1
+
+:: Python: 1D
+%PYTHON% %TEST_DIR%\PICMI_inputs_1d.py
 if errorlevel 1 exit 1
 
-:: TODO: Python tests
+:: Python: RZ
+%PYTHON% %TEST_DIR%\PICMI_inputs_rz.py
+if errorlevel 1 exit 1
diff --git a/recipe/test.sh b/recipe/test.sh
@@ -11,10 +11,20 @@ warpx.3d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_3d max_step=50 diag1.int
 # 2D
 warpx.2d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_2d max_step=50 diag1.intervals=10 diag1.format=openpmd
 
-# 1D: input in 22.01+
-#warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd
+# 1D
+warpx.1d.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_1d max_step=50 diag1.intervals=10 diag1.format=openpmd
 
 # RZ
-warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_2d_rz max_step=50 diag1.intervals=10 diag1.format=openpmd
+warpx.RZ.NOMPI.OMP.DP.OPMD.PSATD.QED ${TEST_DIR}/inputs_rz max_step=50 diag1.intervals=10 diag1.format=openpmd
 
-# TODO: Python tests
+# Python: 3D
+$PYTHON ${TEST_DIR}/PICMI_inputs_3d.py
+
+# Python: 2D
+$PYTHON ${TEST_DIR}/PICMI_inputs_2d.py
+
+# Python: 1D
+$PYTHON ${TEST_DIR}/PICMI_inputs_1d.py
+
+# Python: RZ
+$PYTHON ${TEST_DIR}/PICMI_inputs_rz.py