last changes

.github/workflows/ci.yml

@@ -57,26 +57,26 @@ jobs:
         make intel_classic
         make clean_build
         make intel_classic_debug
-    # - name: set up the job and run base tests
-      # run: |
-        # if [ -z "$DYLD_LIBRARY_PATH" ]; then
-          # echo "DYLD_LIBRARY_PATH not set - setting it now.."
-          # export DYLD_LIBRARY_PATH=$MKLLIB:$DYLD_LIBRARY_PATH
-        # fi
-        # python -m pytest -svv test/test_colitest.py --cov=. --cov-report=xml
+    - name: set up the job and run base tests
+      run: |
+        if [ -z "$DYLD_LIBRARY_PATH" ]; then
+          echo "DYLD_LIBRARY_PATH not set - setting it now.."
+          export DYLD_LIBRARY_PATH=$MKLLIB:$DYLD_LIBRARY_PATH
+        fi
+        python -m pytest -svv test/test_colitest.py --cov=. --cov-report=xml
     - name: compile powr with ifx
       run: |
           make
           make clean_build
           make debug
-    # - name: set up the job and run base tests
-      # run: |
-        # if [ -z "$DYLD_LIBRARY_PATH" ]; then
-          # echo "DYLD_LIBRARY_PATH not set - setting it now.."
-          # export DYLD_LIBRARY_PATH=$MKLLIB:$DYLD_LIBRARY_PATH
-        # fi
-        # python -m pytest -svv test/test_colitest.py --cov=. --cov-report=xml
-    # - name: Upload coverage reports to Codecov
-      # uses: codecov/codecov-action@v3
-      # env:
-        # CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    - name: set up the job and run base tests
+      run: |
+        if [ -z "$DYLD_LIBRARY_PATH" ]; then
+          echo "DYLD_LIBRARY_PATH not set - setting it now.."
+          export DYLD_LIBRARY_PATH=$MKLLIB:$DYLD_LIBRARY_PATH
+        fi
+        python -m pytest -svv test/test_colitest.py --cov=. --cov-report=xml
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

src/coli.f

@@ -131,7 +131,7 @@ SUBROUTINE COLI
      >        TOTOUT, POPMIN, HTOTMINUSND, HTOTND, HTOTNDCOR,
      >        EDDIHINM, EDDIHINMOLD, EDDIHINT, EDDIHINTOLD,
      >        HTOTNDS, DELTAR, ARADTOT, ARADTESTTOT,
-     >        DTDRIN, VDOPUNIT, CUTOPAMEANTHRES
+     >        DTDRIN, VDOPUNIT, CUTOPAMEANTHRES, EMIXMAX
 
 CC***  NO MORE CONTINUATION LINES ALLOWED IN BERLIN
 
@@ -575,7 +575,7 @@ SUBROUTINE COLI
      >       bForceCOLIP, bTDIFFUS, bPLOTRTAU1, bNoIronLaser, 
      >       iHTOTCUT, bMAXEMIX, bALOTri,
      >       bNoNEGEDDIG, bDDVDOP, LPRDH,
-     >       bDEBUG, CUTOPAMEANTHRES, DRLINES_CARD)
+     >       bDEBUG, CUTOPAMEANTHRES, DRLINES_CARD, EMIXMAX)
 
       DO LINEINDEX = 1, LASTIND+NAUTO
          LINE(LINEINDEX) = LINEINDEX
@@ -896,6 +896,7 @@ SUBROUTINE COLI
           ELSE
             IF (BEMIXFIX) THEN
               EPSG(L,IT) = AMAX1 (EMIXFIX, EPSGMAX(L)) 
+              IF (EMIXMAX .GT. .0) EPSG(L,IT)=AMIN1(EPSG(L,IT),EMIXMAX)
             ELSE
               IF (BEPSGMAXERR) THEN 
                 EPSG(L,IT) = EMIXSTART
@@ -906,12 +907,12 @@ SUBROUTINE COLI
           ENDIF          
           EPSGITMAX(IT) = MAX(EPSGITMAX(IT), EPSG(L,IT))
         ENDDO
-        IF (bMAXEMIX) THEN
-C***      New test option: Apply the maximum required EDDIMIX to ALL depth points        
-          DO L=1, ND-1
-            EPSG(L,IT) = EPSGITMAX(IT)
-          ENDDO
-        ENDIF
+c        IF (bMAXEMIX) THEN
+cC***      New test option: Apply the maximum required EDDIMIX to ALL depth points        
+c          DO L=1, ND-1
+c            EPSG(L,IT) = EPSGITMAX(IT)
+c          ENDDO
+c        ENDIF
       ENDDO
 
       EPSGMAX = 0.  !needed for multiple call of COLI (from Goetz)  
@@ -1580,6 +1581,7 @@ SUBROUTINE COLI
      >               FERATUL, FERATLU, ELEVEL, EMCOLI,
      >               FTFE, IVERS_FE_EXPFAC, LPLOT_WCHARM, GAMMACOLI,
      >               OPAROSS, OPAROSSCONT, OPALAMBDAMEAN, 
+     >               OPAROSSELEM, OPATOTELEM,
      >               GAMMAT, UNLU_TAUMAX, UNLU_TAUMAX2, TEFF,
 C*** die folgenden SKALAREN Parameter werden ausgereicht, weil sie sonst
 C*** ueberschrieben werden!!!!???