Merge remote-tracking branch 'origin/master' into mapping_to_from_rho…

…_tor_norm
gafusion · Jul 13, 2023 · 989b295 · 989b295
2 parents df2cf6b + c9aa108
commit 989b295
Show file tree

Hide file tree

Showing 36 changed files with 3,639 additions and 3,714 deletions.
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
 
@@ -22,7 +22,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: '3.6.15'
+        python-version: '3.6'
 
     - name: Install numpy
       run: |
@@ -34,7 +34,7 @@ jobs:
 
     - name: Install OMAS
       run: |
-        python3 -m pip install .
+        python3 -m pip install .[machine]
 
     - name: Move to root and try importing OMAS
       run: |

diff --git a/.github/workflows/regression_no_munittest.yml b/.github/workflows/regression_no_munittest.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
 
@@ -29,7 +29,7 @@ jobs:
 
     - name: Install OMAS
       run: |
-        python3 -m pip install .
+        python3 -m pip install .[machine]
 
     - name: Move to root and try importing OMAS
       run: |
@@ -38,4 +38,4 @@ jobs:
 
     - name: Run OMAS tests
       run: |
-        make test_no_munittest
+        make test_no_munittest
diff --git a/omas/machine_mappings/d3d.py b/omas/machine_mappings/d3d.py
@@ -450,7 +450,7 @@ def coils_non_axisymmetric_hardware(ods, pulse):
         for shot in comp:
             if pulse > compshot:
                 compshot = shot
-
+                break
         coil_names += list(comp[compshot].keys())
 
     for k, fcid in enumerate(coil_names):
@@ -1220,6 +1220,7 @@ def magnetics_floops_data(ods, pulse, nref=0):
         for shot in comp:
             if pulse > compshot:
                 compshot = shot
+                break
         for compsig in comp[compshot]:
             if compsig == 'N1COIL' and pulse > 112962:
                 continue
@@ -1277,6 +1278,7 @@ def magnetics_probes_data(ods, pulse):
         for shot in comp:
             if pulse > compshot:
                 compshot = shot
+                break
         for compsig in comp[compshot]:
             if compsig == 'N1COIL' and pulse > 112962:
                 continue

diff --git a/omas/machine_mappings/support_files/cmod/mhdin.dat b/omas/machine_mappings/support_files/cmod/mhdin.dat
@@ -1,4 +1,4 @@
- &IN3
+ &IN5
  imds = 2
  mdsshot = 2008
  nofile = 0
@@ -13,8 +13,8 @@
  IECOIL = 1
  IVESEL = 1
  IACOIL = 0
- NW = 65
- NH = 65
+ /
+ &IN3
  RSISVS = 6.2207528e-06 9.0367002e-06 1.9982401e-05 2.3677505e-05 4.24846e-05 
  5.3486699e-05 7.5995798e-05 2*7.5990203e-05 7.5995798e-05 9.0367002e-06 
  6.2207528e-06 1.9982401e-05 4.24846e-05 2.3677505e-05 5.3486699e-05 

diff --git a/omas/machine_mappings/support_files/d3d/000001/mhdin.dat b/omas/machine_mappings/support_files/d3d/000001/mhdin.dat
diff --git a/omas/machine_mappings/support_files/d3d/112001/mhdin.dat b/omas/machine_mappings/support_files/d3d/112001/mhdin.dat