Changeset 28076

Timestamp:

01/29/24 13:10:49 (14 months ago)

Author:

jdquinn

Message:

CHG: Updated m1qn3 to overcome warnings with modern Fortran compilers

Location:

issm/trunk-jpl/externalpackages/m1qn3

Files:

• install.sh (modified) (2 diffs)
• patch/m1qn3.f.patch (modified) (2 diffs)

issm/trunk-jpl/externalpackages/m1qn3/install.sh

@@ -6 +6 @@
 VER=3.3
 
-PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+PREFIX="${ISSM_EXT_DIR}/m1qn3/install" # Set to location where external package should be installed
 
 # Cleanup
@@ -22 +22 @@
 rm -rf m1qn3-${VER}-distrib
 
-#patch
-#patch -u -b src/src/m1qn3.f -i patch/m1qn3.f.patch
+# Apply patches to src
 patch src/src/m1qn3.f patch/m1qn3.f.patch
 

issm/trunk-jpl/externalpackages/m1qn3/patch/m1qn3.f.patch

@@ -1 @@
---- src/src/m1qn3.f     2009-10-20 06:39:35.000000000 -0400
-+++ m1qn3.f     2021-08-13 14:44:30.276019165 -0400
+--- src/src/m1qn3.f     2009-10-20 03:39:35
++++ m1qn3.f     2024-01-29 13:06:00
 @@ -802,7 +802,7 @@
       &        "  iter  simul  stepsize            f                |g|",
@@ -10 +10 @@
        endif
        if (impres.ge.5) write (io,940) eps1
+@@ -1354,7 +1354,9 @@
+ c
+       if (tg.eq.0.d0) go to 940
+       fn=fg
+-      do 930 i=1,n
++      do i=1,n
++        goto 930
++      end do
+   930 xn(i)=xn(i)+tg*d(i)
+   940 if (imp.le.3) go to 999
+       write (io,1001)
+@@ -1365,7 +1367,9 @@
+ c
+ c               recopiage de x et boucle
+ c
+-  950 do 960 i=1,n
++  950 do i=1,n
++        goto 960
++      end do
+   960 x(i)=xn(i)+t*d(i)
+       go to 100
+ c     --- linesearch finished, no skip at next entry in mlis3