Index: cad/calculix-ccx/Makefile =================================================================== --- cad/calculix-ccx/Makefile (revision 473369) +++ cad/calculix-ccx/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ccx -PORTVERSION= 2.13 -PORTREVISION= 1 +PORTVERSION= 2.14 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ PKGNAMEPREFIX= CalculiX- @@ -17,6 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libarpack.so:math/arpack \ + libmetis.so:math/metis4 \ libspooles.so:math/spooles \ libtaucs.so:math/taucs @@ -36,16 +36,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_SINGLE= METIS -OPTIONS_SINGLE_METIS= METIS4 METISEDF -OPTIONS_DEFAULT= METISEDF - -METIS4_DESC= Reference Metis4 Implementation -METIS4_DEPENDS= libmetis.so:math/metis4 - -METISEDF_DESC= EDF Metis Variant -METISEDF_DEPENDS= libmetis.so:math/metis-edf - .include .if ${PORT_OPTIONS:MDOCS} Index: cad/calculix-ccx/distinfo =================================================================== --- cad/calculix-ccx/distinfo (revision 473369) +++ cad/calculix-ccx/distinfo (working copy) @@ -1,9 +1,9 @@ -TIMESTAMP = 1509304679 -SHA256 (calculix/ccx_2.13.src.tar.bz2) = 7685f4ddd0dc698fa1ad0f82594a6fe52ffa8f604c1e74befa048d3d46f49ce2 -SIZE (calculix/ccx_2.13.src.tar.bz2) = 1166432 -SHA256 (calculix/ccx_2.13.htm.tar.bz2) = 34061658590d9c584c52037cfe3cb6d4305287092cce693a3776423459851b8b -SIZE (calculix/ccx_2.13.htm.tar.bz2) = 2143576 -SHA256 (calculix/ccx_2.13.ps.tar.bz2) = 9c7f2c4fb4f8669b6c9ecb13fc4f54f9d96d23739138cf807cc8b454f0e6ea3c -SIZE (calculix/ccx_2.13.ps.tar.bz2) = 2643528 -SHA256 (calculix/ccx_2.13.test.tar.bz2) = b6eedf6797b5ac6550b21c48f9a13cbd6094eb335c72f587992a2f770af27ad0 -SIZE (calculix/ccx_2.13.test.tar.bz2) = 9429551 +TIMESTAMP = 1526335200 +SHA256 (calculix/ccx_2.14.src.tar.bz2) = 59de9965d8f69141a34519101f7dd932c7d8d2be15480b31062b92512545fec4 +SIZE (calculix/ccx_2.14.src.tar.bz2) = 1160412 +SHA256 (calculix/ccx_2.14.htm.tar.bz2) = 4e697b40e68c12a7b9e67516b59ec18ee4779ab1719c7582fc67d38a81ae8988 +SIZE (calculix/ccx_2.14.htm.tar.bz2) = 2218811 +SHA256 (calculix/ccx_2.14.ps.tar.bz2) = 362897a739939d247e623a737b9c80313222f1f0e113b310b78c883d59f22128 +SIZE (calculix/ccx_2.14.ps.tar.bz2) = 2674965 +SHA256 (calculix/ccx_2.14.test.tar.bz2) = d0b8b7f4aa25691e703b3b91e1d4280fa73967380a7c3d110f868868c48b4003 +SIZE (calculix/ccx_2.14.test.tar.bz2) = 9661509 Index: cad/calculix-ccx/files/patch-CalculiX.h =================================================================== --- cad/calculix-ccx/files/patch-CalculiX.h (revision 473369) +++ cad/calculix-ccx/files/patch-CalculiX.h (working copy) @@ -1,6 +1,6 @@ ---- CalculiX.h.orig 2017-10-08 20:06:28 UTC +--- CalculiX.h.orig 2018-04-28 14:05:18 UTC +++ CalculiX.h -@@ -15,12 +15,14 @@ +@@ -16,12 +16,14 @@ /* along with this program; if not, write to the Free Software */ /* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -17,7 +17,7 @@ #define FORTRAN(A,B) A##_ B #elif ARCH == IRIX || ARCH == IRIX64 #define FORTRAN(A,B) A##_##B -@@ -28,7 +30,7 @@ +@@ -29,7 +31,7 @@ #define FORTRAN(A,B) A##B #endif Index: cad/calculix-ccx/files/patch-Makefile =================================================================== --- cad/calculix-ccx/files/patch-Makefile (revision 473369) +++ cad/calculix-ccx/files/patch-Makefile (working copy) @@ -1,11 +1,11 @@ ---- Makefile.orig 2017-10-08 20:06:29 UTC +--- Makefile.orig 2018-04-28 14:05:19 UTC +++ Makefile @@ -1,9 +1,9 @@ --CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT --FFLAGS = -Wall -O3 -fopenmp -+CFLAGS += -O3 -fopenmp -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -+FFLAGS += -O3 -fopenmp +-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT +-FFLAGS = -Wall -O3 ++CFLAGS += -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DTAUCS ++FFLAGS += -O3 -CC=cc -FC=gfortran @@ -14,7 +14,7 @@ .c.o : $(CC) $(CFLAGS) -c $< -@@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o) +@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o) DIR=../../../SPOOLES.2.2 LIBS = \ @@ -21,12 +21,13 @@ - $(DIR)/spooles.a \ - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc -+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \ -+ -lm ++ -ltaucs -lmetis \ ++ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \ ++ -lpthread -lm - ccx_2.13: $(OCCXMAIN) ccx_2.13.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.13.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.13.a $(LIBS) -+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.13.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.13.a $(LIBS) $(LDFLAGS) + ccx_2.14: $(OCCXMAIN) ccx_2.14.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS) ++ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS) $(LDFLAGS) - ccx_2.13.a: $(OCCXF) $(OCCXC) + ccx_2.14.a: $(OCCXF) $(OCCXC) ar vr $@ $? Index: cad/calculix-ccx/pkg-plist =================================================================== --- cad/calculix-ccx/pkg-plist (revision 473369) +++ cad/calculix-ccx/pkg-plist (working copy) @@ -1031,16 +1031,92 @@ %%PORTDOCS%%%%DOCSDIR%%/ccx/img1923.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img1924.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img1925.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1926.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1927.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1928.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1929.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img193.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1930.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1931.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1932.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1933.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1934.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1935.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1936.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1937.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1938.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1939.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img194.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1940.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1941.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1942.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1943.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1944.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1945.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1946.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1947.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1948.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1949.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img195.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1950.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1951.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1952.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1953.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1954.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1955.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1956.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1957.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1958.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1959.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img196.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1960.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1961.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1962.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1963.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1964.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1965.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1966.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1967.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1968.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1969.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img197.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1970.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1971.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1972.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1973.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1974.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1975.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1976.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1977.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1978.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1979.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img198.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1980.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1981.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1982.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1983.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1984.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1985.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1986.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1987.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1988.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1989.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img199.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1990.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1991.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1992.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1993.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1994.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1995.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1996.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1997.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1998.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1999.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img2.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img20.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img200.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img2000.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img2001.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img201.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img202.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img203.png @@ -2268,7 +2344,17 @@ %%PORTDOCS%%%%DOCSDIR%%/ccx/node403.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node404.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node405.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node406.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node407.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node408.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node409.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node41.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node410.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node411.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node412.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node413.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node414.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node415.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node42.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node43.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node44.html @@ -2332,7 +2418,7 @@ %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html -%%PORTDOCS%%%%DOCSDIR%%/ccx_2.13.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/ccx_2.14.ps.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref @@ -2416,6 +2502,12 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_freq_coord3.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_freq_coord3.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_freq_coord3.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord1.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord1.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord1.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_sens_stress_coord2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamabq.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamabq.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamb.dat.ref @@ -2486,6 +2578,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamheatplas.dat.ref @@ -2563,6 +2657,9 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp1rotate.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp1rotate.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp1rotate.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2rotate.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2rotate.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamp2rotate.inp @@ -2627,6 +2724,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied6.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied7.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied7.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptrans.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptrans.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamrb.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamrb.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamrb2.dat.ref @@ -2633,6 +2732,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamrb2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.dat.ref @@ -2655,6 +2756,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamuamp.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bolt.dat.ref @@ -2662,6 +2765,9 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxprofile2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/branch1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/branch1.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/branch2.dat.ref @@ -2766,10 +2872,12 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.inp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1per.dat.ref -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1per.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.dat.ref @@ -2776,8 +2884,6 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.inp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4comp.dat.ref -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4comp.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.dat.ref @@ -2946,7 +3052,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/induction2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain.inp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/input.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinth1fin.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinth1fin.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinthstepped.dat.ref @@ -2953,6 +3060,15 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinthstepped.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinthstraight.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinthstraight.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot1.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot1.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot1.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot2.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot3.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot3.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/largerot3.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer1.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.dat.ref @@ -2968,6 +3084,15 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass3.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane2.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane3.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane3.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane3.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/metalforming.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/metalforming.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/metalformingmortar.dat.ref @@ -2975,6 +3100,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modelchel.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modelchel.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modelchel.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modelchel2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modelchel2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/moehring.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/moehring.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mpcforce.dat.ref @@ -2983,6 +3110,9 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multistage.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.inp @@ -3043,6 +3173,14 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret5.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret5.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret5.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret6.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret6.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret6.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret7.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret7.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.inp @@ -3066,6 +3204,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring3.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring3.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring4.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring4.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact1.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact2.dat.ref @@ -3232,6 +3372,9 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.frd.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss2.dat.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss2.frd.ref +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss2.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twobeam.frd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unet1.dat.ref %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unet1.inp