Skip to content
Draft
13 changes: 9 additions & 4 deletions .github/workflows/mcxtrace-conda-basictest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,17 @@ jobs:
channels: conda-forge
python-version: ${{ matrix.python }}

- name: Setup conda
id: setup-conda
- name: Get conda dependency list
id: conda-deps
run: |
./src/devel/bin/mccode-create-conda-yml -m mcxtrace -n mcxtrace -o dependencies.yml
conda env update --file dependencies.yml
echo DONE
cat dependencies.yml

- name: Update conda
id: update-conda
run: |
conda install mamba -y
mamba env update --file dependencies.yml

- name: Check versions
id: version-checks
Expand Down
3 changes: 1 addition & 2 deletions mcstas-comps/share/union-init.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
// by the last Union_master.



// Initialize global positions / rotations to transform lists
// These are lists of pointers to positons / rotations, that will be updated from global frame
// to the frame of the master component that uses them in that masters initialize section.
Expand All @@ -48,7 +47,7 @@
// Initialize global_process_list
// Used to facilitate communication between processes and the other types of Union components
struct pointer_to_global_process_list global_process_list = {0,NULL};

// Initialize global_material_list
// Used to facilitate communication between materials and the other types of Union components
struct pointer_to_global_material_list global_material_list = {0,NULL};
Expand Down
Loading