Upgrade Code_Aster to 14.6.0-1.
This implies:
- french /aster builds fine with clang, but it seg-faults: switched to Gcc
- ASTK is upgraded to 2019.0-1
- math/mumps is upgraded to 5.1.2-aster7
- TFEL/MFront is now required, but when the compilers of tfel and aster are
different, it cannot be linked
. recopopy science/tfel to science/tfel-edf and depends on science/tfel-edf
. science/tfel-edf is built by Gcc, from the sources included in Aster's
tarball
. register the conflicts
This commit is contained in:
Thierry Thomas
parent
058e5ba0ff
commit
d50519a41d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=556349
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= astk
|
||||
DISTVERSION= 2019.0-1
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 2020.0-1
|
||||
CATEGORIES= cad
|
||||
.if !defined(CLIENT_SEUL)
|
||||
PKGNAMESUFFIX= -serveur
|
||||
@ -52,11 +51,10 @@ SUB_LIST= inst_dir=${inst_dir} tools_dir=${tools_dir}
|
||||
LINSTDIR= aster/ASTK
|
||||
inst_dir= ${PREFIX}/${LINSTDIR}
|
||||
aster_dir= ${LOCALBASE}/aster/${vaster}
|
||||
S_SCRIPTS= bin/as_run bin/parallel_cp asrun/installation.py \
|
||||
share/codeaster/asrun/data/mpirun_template
|
||||
S_PYLIBS= share/codeaster/asrun/examples/alamain.py \
|
||||
unittest/datafiles/config_serveurs unittest/010_misc.py \
|
||||
unittest/015_package.py unittest/run_test.py
|
||||
S_SCRIPTS= bin/as_run bin/parallel_cp
|
||||
S_PYLIBS= share/codeaster/asrun/examples/alamain.py \
|
||||
unittest/010_misc.py unittest/015_package.py \
|
||||
unittest/run_test.py
|
||||
C_SCRIPTS= bin/astk bin/bsf
|
||||
tools_dir= ${LOCALBASE}/aster/outils
|
||||
conf_dir= ${WRKSRC}/etc/astkrc
|
||||
@ -85,7 +83,7 @@ WITH_PBS= yes
|
||||
WITH_MPI= yes
|
||||
. endif
|
||||
. if defined(WITH_MPI)
|
||||
RUN_DEPENDS+= ${HOME_MPI}/bin/mpirun:net/mpich2
|
||||
RUN_DEPENDS+= ${HOME_MPI}/bin/mpirun:net/mpich
|
||||
HOME_MPI= ${LOCALBASE}
|
||||
PLIST_SUB+= MPI=""
|
||||
. else
|
||||
@ -188,7 +186,8 @@ do-configure:
|
||||
.if !defined(CLIENT_SEUL)
|
||||
. for scripts in ${S_SCRIPTS}
|
||||
${REINPLACE_CMD} -e "s|?SHELL_EXECUTION?|${SHELL_INSTALL_ASTER}|" \
|
||||
-e "s|?ASTER_ROOT?|${PREFIX}/aster|" ${WRKSRC}/${scripts}
|
||||
-e "s|?ASTER_ROOT?|${PREFIX}/aster|;s|python3|${PYTHON_CMD}|" \
|
||||
${WRKSRC}/${scripts}
|
||||
. endfor
|
||||
${REINPLACE_CMD} -e "s|?ASTER_VERSION?|${vaster}|" \
|
||||
-e 's|#?vers : VVV?|vers : ${vaster}|' \
|
||||
@ -229,10 +228,11 @@ do-configure:
|
||||
-e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs}
|
||||
. endfor
|
||||
. if defined(WITH_PBS)
|
||||
. for cf in etc/asrun unittest/datafiles/config_serveurs
|
||||
${REINPLACE_CMD} -e "s|batch : non|batch : oui|" \
|
||||
${WRKSRC}/${cf}
|
||||
. endfor
|
||||
${WRKSRC}/etc/asrun
|
||||
. else
|
||||
${REINPLACE_CMD} -e "s|batch : oui|batch : non|" \
|
||||
${WRKSRC}/unittest/datafiles/config_serveurs
|
||||
. endif
|
||||
. if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING)
|
||||
${REINPLACE_CMD} \
|
||||
@ -276,6 +276,7 @@ do-configure:
|
||||
.for sh in ${BASH2RC3}
|
||||
${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKCONF}/${sh}
|
||||
.endfor
|
||||
${FIND} ${WRKSRC} -name "*.bak" -delete
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${inst_dir}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
|
||||
PORTNAME= aster
|
||||
DISTVERSION= ${ASTER_DISTVERSION}
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= french cad
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
@ -24,7 +23,6 @@ NOT_FOR_ARCHS_REASON= ARG_MAX is too small for Code_Aster on 32 bits systems
|
||||
# - WITH_BLAS: don't link with atlas, even if present, but with blas;
|
||||
# (blas might be slower, but is lighter)
|
||||
# - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
|
||||
# - WITHOUT_EFICAS: don't install ASter Command FIle Editor;
|
||||
# - WITHOUT_GMSH: don't install GMSH (a mesh generator);
|
||||
# - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
|
||||
# - WITHOUT_MACR_RECAL: don't install Numerical Python
|
||||
@ -39,23 +37,27 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \
|
||||
${LOCALBASE}/lib/libscotch.a:cad/scotch \
|
||||
gnproc:sysutils/coreutils \
|
||||
bash:shells/bash \
|
||||
getopt>0:misc/getopt \
|
||||
xterm:x11/xterm \
|
||||
${PYNUMPY}
|
||||
# pylupdate5:textproc/py-qt5-xml
|
||||
LIB_DEPENDS+= libhdf5.so:science/hdf5 \
|
||||
libmetis.so:math/metis \
|
||||
libmed.so:french/med
|
||||
# libAsterInterface.so:science/mfront
|
||||
# libAsterInterface.so:science/tfel
|
||||
libmed.so:french/med \
|
||||
libAsterInterface.so:science/tfel-edf
|
||||
RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \
|
||||
astk-serveur>0:cad/astk-serveur \
|
||||
xterm:x11/xterm
|
||||
xterm:x11/xterm \
|
||||
${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
|
||||
|
||||
USES= bison fortran gettext python:3.6+ qt:5 tk
|
||||
# Note 1: compile fine with clang but segfault when sharing args between C and Fortran
|
||||
# Note 2: tfel/mfront must be compiled with the same compiler, else it does not link
|
||||
USE_GCC= yes
|
||||
USE_BINUTILS= yes
|
||||
USE_QT= linguisttools_build
|
||||
|
||||
CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*
|
||||
#CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*
|
||||
|
||||
.if defined(WITH_ATLAS)
|
||||
USES+= blaslapack:atlas
|
||||
@ -102,6 +104,15 @@ FLAGARCH= -DP_LINUX -DLINUX
|
||||
FLAGARCH= -DLINUX64
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
DEBUG_FLAGS= --debug
|
||||
CFLAGS+= -D__DEBUG_ALLOCATE__
|
||||
FFLAGS+= -D__DEBUG_ALLOCATE__
|
||||
MAKE_ENV+= FCFLAGS="-g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}"
|
||||
.else
|
||||
MAKE_ENV+= FCFLAGS="${FFLAGS} -fno-tree-dse ${FLAGARCH}"
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_ASTK_CLI)
|
||||
RUN_DEPENDS+= astk-client>0:cad/astk-client
|
||||
PLIST_SUB+= ASTK_CLIENT="" ASTKDIR=${ASTKDIR}
|
||||
@ -184,8 +195,10 @@ PFX2FIX= bin/as_run etc/codeaster/aster etc/codeaster/profile.sh \
|
||||
${VE}/share/aster/CTestTestfile.cmake \
|
||||
${VE}/include/aster/asterf_config.h \
|
||||
${VE}/include/aster/asterc_config.h \
|
||||
${VE}/share/aster/execute_codeaster \
|
||||
${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh
|
||||
POSTPY2FIX= post-patch-waf.engine post-patch-data__post_install
|
||||
POSTBASH2FIX= execute_codeaster create_install_script
|
||||
inst_dir= ${PREFIX}/${PORTNAME}
|
||||
tools_dir= ${PREFIX}/${PORTNAME}/outils
|
||||
tools= cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
|
||||
@ -210,9 +223,7 @@ ExportPATH?= /tmp/maillages
|
||||
|
||||
pre-configure:
|
||||
${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \
|
||||
${WRKSRC}/setup.cfg
|
||||
${REINPLACE_CMD} -e 's|/opt/aster|${STAGEDIR}${inst_dir}|' \
|
||||
${WRKSRC}/setup.cfg
|
||||
-e 's|/opt/aster|${STAGEDIR}${inst_dir}|' ${WRKSRC}/setup.cfg
|
||||
${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|' \
|
||||
${WRKSRC}/products.py
|
||||
${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g" \
|
||||
@ -265,16 +276,12 @@ pre-configure:
|
||||
${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
|
||||
>> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
|
||||
# Disable MFront at the moment (compilation error)
|
||||
# ${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
|
||||
# ${ECHO_CMD} "TFELHOME = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
|
||||
${REINPLACE_CMD} -e "s|waf configure|waf configure --disable-mfront|" \
|
||||
${WRKSRC}/products.py
|
||||
${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "CC='${CC}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "gcc='${CC}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "CXX='${CXX}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "LD='${FC}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "LD='${LD}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "F90='${FC}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'" \
|
||||
>> ${WRKSRC}/setup.cfg
|
||||
@ -301,6 +308,8 @@ pre-configure:
|
||||
${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "TERMINAL='xterm'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "EDITOR='${WITH_ED}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "CXXFLAGS='${CXXFLAGS}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "CXXFLAGS_DBG='${CXXFLAGS:C|-O2|--debug|}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "LDFLAGS='${LDFLAGS}'" >> ${WRKSRC}/setup.cfg
|
||||
${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \
|
||||
>> ${WRKSRC}/setup.cfg
|
||||
@ -364,8 +373,6 @@ pre-build:
|
||||
.for pp in ${POSTPY2FIX}
|
||||
${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp}
|
||||
.endfor
|
||||
${REINPLACE_CMD} -e "s|%%WRKDIR%%|${WRKDIR}|" \
|
||||
${WRKDIR}/post_patches/post-patch-bibfor__jeveux__jedebu.F90
|
||||
|
||||
do-build:
|
||||
(cd ${BUILD_WRKSRC} && \
|
||||
@ -380,6 +387,12 @@ post-install:
|
||||
.for f in ${PFX2FIX}
|
||||
${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
|
||||
.endfor
|
||||
.for f in ${POSTBASH2FIX}
|
||||
${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
|
||||
${STAGEDIR}${inst_dir}/${VE}/share/aster/${f}
|
||||
.endfor
|
||||
${REINPLACE_CMD} -e 's|LINUX64|LINUX64, FREEBSD|' \
|
||||
${STAGEDIR}${inst_dir}/asrun/core/default_configuration.py
|
||||
(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
|
||||
-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
|
||||
(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
|
||||
|
||||
@ -10,7 +10,7 @@ MASTER_SITES= http://www.code-aster.org/FICHIERS/ \
|
||||
DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
|
||||
DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo
|
||||
|
||||
ASTER_VER= 14.4.0
|
||||
ASTER_VER= 14.6.0
|
||||
ASTER_DISTVERSION= ${ASTER_VER}-1
|
||||
EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1572098780
|
||||
SHA256 (aster-full-src-14.4.0-1.noarch.tar.gz) = fd29b85f5dd3370dfa6fcae9d955f94e3eee5e4c633591aa292f0e7ce3f7ab7c
|
||||
SIZE (aster-full-src-14.4.0-1.noarch.tar.gz) = 301386329
|
||||
TIMESTAMP = 1604590054
|
||||
SHA256 (aster-full-src-14.6.0-1.noarch.tar.gz) = dcb3900de1e5c0624060253660a63512ab415cbe143cdd87867a0276ef6bf233
|
||||
SIZE (aster-full-src-14.6.0-1.noarch.tar.gz) = 270695003
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- as_setup.py.orig 2019-10-01 12:45:34 UTC
|
||||
--- as_setup.py.orig 2020-10-26 15:54:27 UTC
|
||||
+++ as_setup.py
|
||||
@@ -45,6 +45,8 @@ import tarfile
|
||||
import compileall
|
||||
@ -7,9 +7,9 @@
|
||||
+import fileinput
|
||||
+import string
|
||||
import distutils.sysconfig as SC
|
||||
from functools import partial
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
@@ -410,6 +412,7 @@ class SETUP:
|
||||
@@ -411,6 +413,7 @@ class SETUP:
|
||||
archive filename !),
|
||||
extract_as : rename content.
|
||||
"""
|
||||
@ -18,9 +18,10 @@
|
||||
if kargs.get('external')!=None:
|
||||
self._call_external(**kargs)
|
||||
@@ -518,6 +521,88 @@ class SETUP:
|
||||
os.chdir(prev)
|
||||
if iextr_as:
|
||||
self.Clean(to_delete=path)
|
||||
|
||||
+
|
||||
+ # Insert FreeBSD patches here
|
||||
+ file2patch = os.path.join(self.workdir, self.content, 'bibc/wscript')
|
||||
+ self._print('FreeBSD patch: no libdl => modify ' + file2patch)
|
||||
@ -74,7 +75,7 @@
|
||||
+ sys.stdout.write(ligne)
|
||||
+ for f2p in ('waf', 'waf.main', 'waf_variant', 'waf_std', 'waf_mpi', 'bibpyt/Macro/macr_ecre_calc_ops.py'):
|
||||
+ file2patch = os.path.join(self.workdir, self.content, f2p)
|
||||
+ self._print('FreeBSD patch: /bin/bash => modify ' + file2patch)
|
||||
+ self._print('FreeBSD patch: /bin/bash + GNU getopt => modify ' + file2patch)
|
||||
+ for ligne in fileinput.input(file2patch, inplace=1):
|
||||
+ nl = 0
|
||||
+ nl = ligne.find("/bin/bash")
|
||||
@ -85,14 +86,14 @@
|
||||
+ nl = 0
|
||||
+ nl = ligne.find("getopt ")
|
||||
+ if nl > 0:
|
||||
+ ligne =ligne.replace("getopt ", "getopts ")
|
||||
+ ligne =ligne.replace("getopt ", "%%LOCALBASE%%/bin/getopt ")
|
||||
+ sys.stdout.write(ligne)
|
||||
+ self._print('FreeBSD patches: waf.engine and data/post_install in %s' % os.path.join(self.workdir, self.content))
|
||||
+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-waf.engine')
|
||||
+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-data__post_install')
|
||||
+ self._print('FreeBSD patches: memory detection in bibc/utilitai/mempid.c in %s' % os.path.join(self.workdir, self.content))
|
||||
+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibc__utilitai__mempid.c')
|
||||
+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibfor__jeveux__jedebu.F90')
|
||||
+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibc__supervis__aster_utils.c')
|
||||
+ file2patch = os.path.join(self.workdir, self.content, 'waftools/mathematics.py')
|
||||
+ self._print('FreeBSD patch: nproc => gnproc ' + file2patch)
|
||||
+ for ligne in fileinput.input(file2patch, inplace=1):
|
||||
@ -102,16 +103,6 @@
|
||||
+ ligne =ligne.replace("'nproc'", "'gnproc'")
|
||||
+ sys.stdout.write(ligne)
|
||||
+ # End of FreeBSD patches
|
||||
+
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
def Configure(self, **kargs):
|
||||
"""Configuration of the product.
|
||||
@@ -1454,7 +1532,7 @@ class SYSTEM:
|
||||
if type(profile) is str:
|
||||
ftmp = osp.join(self._tmpdir, 'temp.opt_env')
|
||||
open(ftmp, 'w').write(profile)
|
||||
- os.chmod(ftmp, 755)
|
||||
+ os.chmod(ftmp, 0o755)
|
||||
profile = ftmp
|
||||
|
||||
if not osp.isfile(profile):
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- products.py.orig 2019-10-01 12:45:34 UTC
|
||||
--- products.py.orig 2020-10-26 15:54:27 UTC
|
||||
+++ products.py
|
||||
@@ -637,7 +637,8 @@ def setup_mumps(dep, summary, **kargs):
|
||||
@@ -658,7 +658,8 @@ def setup_mumps(dep, summary, **kargs):
|
||||
'capturestderr' : False,
|
||||
}),
|
||||
('Make' , {
|
||||
@ -10,13 +10,13 @@
|
||||
'capturestderr' : False,
|
||||
}),
|
||||
('Install', {
|
||||
@@ -691,7 +692,8 @@ def setup_aster(dep, summary, **kargs):
|
||||
'HOME_MUMPS', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
|
||||
'HOME_MED', 'HOME_HDF', 'HOME_MFRONT',
|
||||
@@ -718,7 +719,8 @@ def setup_aster(dep, summary, **kargs):
|
||||
'HOME_MED', 'HOME_HDF', 'HOME_MFRONT', 'HOME_BOOST',
|
||||
'LIBPATH_BOOST', 'LIBNAME_BOOST',
|
||||
#'HOME_GMSH', 'HOME_HOMARD', optional
|
||||
- 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
|
||||
+ 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS',
|
||||
+ 'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ],
|
||||
set=['LIBPATH_HDF', 'LIBPATH_MED', 'LIBPATH_METIS', 'LIBPATH_SCOTCH',
|
||||
'LIBPATH_MUMPS', 'LIBPATH_MFRONT'],
|
||||
reqobj=['file:?ASTER_ROOT?/bin/as_run',
|
||||
'file:?ASTER_ROOT?/etc/codeaster/profile.sh'],
|
||||
)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- products_data.py.orig 2019-10-01 12:45:34 UTC
|
||||
--- products_data.py.orig 2020-10-26 15:54:27 UTC
|
||||
+++ products_data.py
|
||||
@@ -110,10 +110,8 @@ def configure(self):
|
||||
@@ -130,10 +130,8 @@ def configure(self):
|
||||
'%(HOME_HDF)s/include',
|
||||
'%(HOME_MED)s/include',
|
||||
'%(HOME_MUMPS)s/include',
|
||||
|
||||
@ -1,34 +1,21 @@
|
||||
--- setup.py.orig 2019-10-01 12:45:34 UTC
|
||||
--- setup.py.orig 2020-10-26 15:54:27 UTC
|
||||
+++ setup.py
|
||||
@@ -419,8 +419,8 @@ def main():
|
||||
# librairies
|
||||
pylib = SC.get_python_lib(standard_lib=True)
|
||||
prefixlib = osp.dirname(pylib)
|
||||
- cfg['PYTHONLIB'] = '-L' + prefixlib + ' -L' + osp.join(pylib, 'config') + \
|
||||
- ' -l' + pythonXY
|
||||
+ cfg['PYTHONLIB'] = '-L' + prefixlib + ' -L' + pylib + \
|
||||
+ ' -l' + pythonXY + '%%PYTHON_ABIVER%%'
|
||||
# python modules location
|
||||
cfg['PYTHONPATH'] = cfg.get('PYTHONPATH', '')
|
||||
cfg['OPT_ENV'] = cfg.get('OPT_ENV', '')
|
||||
@@ -488,14 +488,14 @@ def main():
|
||||
ftools.find_and_set(
|
||||
cfg, 'SHELL_EXECUTION', ['bash', 'ksh', 'zsh'], err=False)
|
||||
ftools.check(python_version, 'Python version')
|
||||
- pylibrary = ftools.findlib_and_set(cfg, 'PYTHON_LIBRARY', pythonXY,
|
||||
+ pylibrary = ftools.findlib_and_set(cfg, 'PYTHON_LIBRARY', pythonXY + 'm',
|
||||
@@ -485,12 +485,12 @@ def main():
|
||||
[pythonXY, pythonXY + "m"],
|
||||
paths=[pylib], prefshared=True, err=True)
|
||||
cfg['PYTHON_LIBRARY'] = pylibrary
|
||||
- cfg['PYTHON_LIBRARY_DIR'] = osp.dirname(pylibrary)
|
||||
- pyinc = ftools.find_and_set(cfg, 'PYTHON_INCLUDE', "Python.h", typ='inc',
|
||||
- paths=[osp.join(cfg['HOME_PYTHON'], 'include',
|
||||
- pythonXY)],
|
||||
- err=True)
|
||||
- cfg['PYTHON_INCLUDE'] = osp.dirname(pyinc)
|
||||
+ #pyinc = ftools.find_and_set(cfg, 'PYTHON_INCLUDE', "Python.h", typ='inc',
|
||||
+ # paths=[osp.join(cfg['HOME_PYTHON'], 'include',
|
||||
+ # pythonXY + '%%PYTHON_ABIVER%%')],
|
||||
+ # append=False, err=True)
|
||||
+ #cfg['PYTHON_INCLUDE'] = osp.dirname(pyinc)
|
||||
+ cfg['PYTHON_LIBRARY_DIR'] = osp.dirname(pylib)
|
||||
+# pyinc = ftools.find_and_set(cfg, 'PYTHON_INCLUDE', "Python.h", typ='inc',
|
||||
+# paths=[osp.join(cfg['HOME_PYTHON'], 'include',
|
||||
+# pythonXY)],
|
||||
+# err=True)
|
||||
+# cfg['PYTHON_INCLUDE'] = osp.dirname(pyinc)
|
||||
cfg['PYTHON_ALIAS'] = ''
|
||||
if PY3:
|
||||
py3tmpdir = tempfile.mkdtemp()
|
||||
|
||||
22
french/aster/files/post-patch-bibc__supervis__aster_utils.c
Normal file
22
french/aster/files/post-patch-bibc__supervis__aster_utils.c
Normal file
@ -0,0 +1,22 @@
|
||||
--- bibc/supervis/aster_utils.c.orig 2020-10-20 16:45:20.000000000 +0200
|
||||
+++ bibc/supervis/aster_utils.c 2020-11-22 17:01:12.951054000 +0100
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
/* person_in_charge: mathieu.courtois at edf.fr */
|
||||
|
||||
+#include <string.h>
|
||||
+#define __STDC_WANT_LIB_EXT1__ 1
|
||||
#include "aster_utils.h"
|
||||
#include "aster_module.h"
|
||||
#include "aster_fort.h"
|
||||
@@ -91,7 +93,9 @@
|
||||
/* Initialise un blanc une chaine de caractères (sans '\0' à la fin).
|
||||
* S'applique à une chaine allouée par le Fortran.
|
||||
*/
|
||||
- memset(fstr, ' ', flen);
|
||||
+ if (memset_s(fstr, flen, ' ', flen) != 0) {
|
||||
+ MYABORT("Erreur sur memset_s");
|
||||
+ }
|
||||
}
|
||||
|
||||
char * MakeBlankFStr( _IN STRING_SIZE flen )
|
||||
@ -1,14 +1,11 @@
|
||||
--- bibc/utilitai/mempid.c.orig 2019-09-25 21:45:54.000000000 +0200
|
||||
+++ bibc/utilitai/mempid.c 2020-01-02 22:28:47.035670000 +0100
|
||||
@@ -77,7 +77,11 @@
|
||||
--- bibc/utilitai/mempid.c.orig 2020-10-20 16:45:20.000000000 +0200
|
||||
+++ bibc/utilitai/mempid.c 2020-11-10 19:29:26.945762000 +0100
|
||||
@@ -77,7 +77,7 @@
|
||||
kvm_close(kd);
|
||||
|
||||
/* VmSize */
|
||||
+# if __FreeBSD_version > 1300000
|
||||
- val[0] = B2K((uintmax_t)kp->ki_size);
|
||||
+ val[0] = 0;
|
||||
+# else
|
||||
val[0] = B2K((uintmax_t)kp->ki_size);
|
||||
+# endif
|
||||
/* VmPeak - not defined in /compat/linux/proc/pid/status */
|
||||
val[1] = -1;
|
||||
iret = 0;
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
--- ./bibfor/jeveux/jedebu.F90.orig 2019-09-25 21:45:58.000000000 +0200
|
||||
+++ ./bibfor/jeveux/jedebu.F90 2019-12-31 12:21:04.131247000 +0100
|
||||
@@ -225,6 +225,7 @@
|
||||
k8tab(2) = 'VMPEAK'
|
||||
k8tab(3) = 'VMSIZE'
|
||||
call utgtme(3, k8tab, rval, iret)
|
||||
+ call utmess('I', 'DEBUG_1', nr=3, valr=rval, fname='%%WRKDIR%%/aster_debug1.log')
|
||||
if (rval(2) .le. 0 .or. rval(3) .le. 0) then
|
||||
call utmess('I', 'JEVEUX1_75')
|
||||
endif
|
||||
@@ -232,6 +233,7 @@
|
||||
if (rval(3) .gt. 0) then
|
||||
!
|
||||
call utptme('RLQ_MEM ', rval(3), iret)
|
||||
+ call utmess('I', 'DEBUG_1', nr=3, valr=rval, fname='%%WRKDIR%%/aster_debug2.log')
|
||||
if (rval(1)-rval(3) .le. 0) then
|
||||
call utmess('F', 'JEVEUX1_71', nr=3, valr=rval)
|
||||
endif
|
||||
@ -1449,6 +1449,8 @@ aster/%%VE%%/lib/aster/Messages/__pycache__/calcbt.cpython-%%PYTHON_SUFFIX%%.opt
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcbt.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcchamp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcchamp.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcerror1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcerror1.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcessai0.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcessai0.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/calcessai1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
@ -1547,6 +1549,8 @@ aster/%%VE%%/lib/aster/Messages/__pycache__/dynaline1.cpython-%%PYTHON_SUFFIX%%.
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynaline1.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynamique.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynamique.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynamique1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynamique1.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynapost.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynapost.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/dynavisco.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
@ -1723,6 +1727,8 @@ aster/%%VE%%/lib/aster/Messages/__pycache__/petsc.cpython-%%PYTHON_SUFFIX%%.opt-
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/petsc.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/pilotage.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/pilotage.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/plate1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/plate1.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/plexus.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/plexus.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/post0.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
@ -1753,6 +1759,8 @@ aster/%%VE%%/lib/aster/Messages/__pycache__/proba0.cpython-%%PYTHON_SUFFIX%%.opt
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/proba0.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/progress.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/progress.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/quality1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/quality1.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/recal0.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/recal0.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/lib/aster/Messages/__pycache__/resuelem1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
|
||||
@ -1872,6 +1880,7 @@ aster/%%VE%%/lib/aster/Messages/assembla.py
|
||||
aster/%%VE%%/lib/aster/Messages/cable0.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcbt.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcchamp.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcerror1.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcessai0.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcessai1.py
|
||||
aster/%%VE%%/lib/aster/Messages/calcpression0.py
|
||||
@ -1921,6 +1930,7 @@ aster/%%VE%%/lib/aster/Messages/discrets.py
|
||||
aster/%%VE%%/lib/aster/Messages/dvp.py
|
||||
aster/%%VE%%/lib/aster/Messages/dynaline1.py
|
||||
aster/%%VE%%/lib/aster/Messages/dynamique.py
|
||||
aster/%%VE%%/lib/aster/Messages/dynamique1.py
|
||||
aster/%%VE%%/lib/aster/Messages/dynapost.py
|
||||
aster/%%VE%%/lib/aster/Messages/dynavisco.py
|
||||
aster/%%VE%%/lib/aster/Messages/ecrevisse0.py
|
||||
@ -2009,6 +2019,7 @@ aster/%%VE%%/lib/aster/Messages/partition.py
|
||||
aster/%%VE%%/lib/aster/Messages/partition1.py
|
||||
aster/%%VE%%/lib/aster/Messages/petsc.py
|
||||
aster/%%VE%%/lib/aster/Messages/pilotage.py
|
||||
aster/%%VE%%/lib/aster/Messages/plate1.py
|
||||
aster/%%VE%%/lib/aster/Messages/plexus.py
|
||||
aster/%%VE%%/lib/aster/Messages/post0.py
|
||||
aster/%%VE%%/lib/aster/Messages/postelem.py
|
||||
@ -2024,6 +2035,7 @@ aster/%%VE%%/lib/aster/Messages/prepost5.py
|
||||
aster/%%VE%%/lib/aster/Messages/prepost6.py
|
||||
aster/%%VE%%/lib/aster/Messages/proba0.py
|
||||
aster/%%VE%%/lib/aster/Messages/progress.py
|
||||
aster/%%VE%%/lib/aster/Messages/quality1.py
|
||||
aster/%%VE%%/lib/aster/Messages/recal0.py
|
||||
aster/%%VE%%/lib/aster/Messages/resuelem1.py
|
||||
aster/%%VE%%/lib/aster/Messages/result1.py
|
||||
@ -3707,11 +3719,12 @@ aster/%%VE%%/%%DATADIR%%/__pycache__/aster_full_config.cpython-%%PYTHON_SUFFIX%%
|
||||
aster/%%VE%%/%%DATADIR%%/__pycache__/aster_full_config.cpython-%%PYTHON_SUFFIX%%.pyc
|
||||
aster/%%VE%%/%%DATADIR%%/aster_full_config.py
|
||||
aster/%%VE%%/%%DATADIR%%/config.txt
|
||||
aster/%%VE%%/%%DATADIR%%/create_install_script
|
||||
aster/%%VE%%/%%DATADIR%%/execute_codeaster
|
||||
aster/%%VE%%/%%DATADIR%%/external_programs.js
|
||||
aster/%%VE%%/%%DATADIR%%/post_install
|
||||
aster/%%VE%%/%%DATADIR%%/profile.sh
|
||||
aster/%%VE%%/%%DATADIR%%/profile_mfront.sh
|
||||
aster/%%VE%%/%%DATADIR%%/tests/AnisoLemaitre.mfront
|
||||
aster/%%VE%%/%%DATADIR%%/tests/BurgerAgeing.mfront
|
||||
aster/%%VE%%/%%DATADIR%%/tests/Chaboche.mfront
|
||||
aster/%%VE%%/%%DATADIR%%/tests/DruckPragEcroLin.mfront
|
||||
@ -4229,11 +4242,9 @@ aster/%%VE%%/%%DATADIR%%/tests/fdlv112j.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv112j.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv112k.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv112k.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv112l.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv113a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv113a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv113a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv113b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv114a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv114a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/fdlv114a.mmed
|
||||
@ -4405,9 +4416,12 @@ aster/%%VE%%/%%DATADIR%%/tests/forma40a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma40b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma40b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma40b.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41a.20
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41a.com1
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41b.com1
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41b.com2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma41b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/forma42a.comm
|
||||
@ -4587,7 +4601,6 @@ aster/%%VE%%/%%DATADIR%%/tests/hsna106a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsna106a.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsna106b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsna106b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsna106b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsns101a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsns101a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsns101a.mail
|
||||
@ -4703,7 +4716,6 @@ aster/%%VE%%/%%DATADIR%%/tests/hsnv121a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/hsnv121c.mail
|
||||
@ -4859,7 +4871,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04c.21
|
||||
@ -4870,7 +4881,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04c.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04d.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04d.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04d.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04d.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04e.21
|
||||
@ -4882,7 +4892,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04e.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04g.21
|
||||
@ -4894,11 +4903,9 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04g.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04h.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.export
|
||||
@ -4906,7 +4913,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04i.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04j.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04k.21
|
||||
@ -4918,7 +4924,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04k.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04l.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04m.21
|
||||
@ -4928,7 +4933,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04m.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04m.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04n.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04n.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04n.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04n.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04n.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04o.21
|
||||
@ -4939,7 +4943,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04o.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04o.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04p.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04p.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04p.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04p.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04p.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04q.21
|
||||
@ -4951,7 +4954,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04q.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04r.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04s.21
|
||||
@ -4963,37 +4965,21 @@ aster/%%VE%%/%%DATADIR%%/tests/mac3c04s.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.32
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04t.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04u.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04u.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04u.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04u.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04u.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04v.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04v.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04v.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04v.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04v.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04w.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04w.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04w.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04w.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04w.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04x.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04x.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04x.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04x.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04x.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04y.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04y.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04y.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04y.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04y.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04z.21
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04z.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04z.38
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04z.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c04z.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mac3c05a.33
|
||||
@ -5036,7 +5022,6 @@ aster/%%VE%%/%%DATADIR%%/tests/mfron01c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01d.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01d.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01g.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01g.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron01h.comm
|
||||
@ -5075,22 +5060,8 @@ aster/%%VE%%/%%DATADIR%%/tests/mfron03i.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03i.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03j.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03j.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03j.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03k.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron03k.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04b.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04d.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04d.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04e.com2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04e.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron04e.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron05a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron05a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/mfron05b.comm
|
||||
@ -5841,7 +5812,6 @@ aster/%%VE%%/%%DATADIR%%/tests/sdll151a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll151a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll151a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152a.70
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152a.71
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152a.mail
|
||||
@ -5849,7 +5819,6 @@ aster/%%VE%%/%%DATADIR%%/tests/sdll152b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152c.70
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152c.71
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdll152d.comm
|
||||
@ -6097,7 +6066,6 @@ aster/%%VE%%/%%DATADIR%%/tests/sdls118d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls118e.35
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls118e.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls118e.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls118f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls119a.22
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls119a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdls119a.export
|
||||
@ -6360,7 +6328,6 @@ aster/%%VE%%/%%DATADIR%%/tests/sdlv132d.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv133a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv133a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv133a.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv133b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv134a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv134a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdlv134a.mmed
|
||||
@ -6899,7 +6866,6 @@ aster/%%VE%%/%%DATADIR%%/tests/sdnx100h.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx100i.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx100i.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx100i.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx100j.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx101a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx101a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sdnx101a.mmed
|
||||
@ -7211,7 +7177,6 @@ aster/%%VE%%/%%DATADIR%%/tests/ssll111b.18
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll111b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll111b.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll111b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll111b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll112a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll112a.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll112a.export
|
||||
@ -7304,6 +7269,10 @@ aster/%%VE%%/%%DATADIR%%/tests/ssll501a.com1
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501a.com2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501b.com1
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501b.com2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssll501b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sslp01a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sslp01a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/sslp01a.mail
|
||||
@ -7774,10 +7743,8 @@ aster/%%VE%%/%%DATADIR%%/tests/ssls111f.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111f.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111g.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111g.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111g.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111h.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111h.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111h.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111i.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssls111i.export
|
||||
@ -9042,7 +9009,6 @@ aster/%%VE%%/%%DATADIR%%/tests/ssna122d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna122d.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123a.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssna123c.comm
|
||||
@ -9092,7 +9058,6 @@ aster/%%VE%%/%%DATADIR%%/tests/ssnd101c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd101c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd101d.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd101d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd101d.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd102a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd102a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnd102a.mail
|
||||
@ -9369,6 +9334,9 @@ aster/%%VE%%/%%DATADIR%%/tests/ssnl127d.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127e.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127e.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127e.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127f.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl127f.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl128a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl128a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnl128a.mail
|
||||
@ -11909,7 +11877,6 @@ aster/%%VE%%/%%DATADIR%%/tests/ssnv230a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv230a.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv230b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv230b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv230b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv231a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv231a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv231a.mmed
|
||||
@ -11934,7 +11901,6 @@ aster/%%VE%%/%%DATADIR%%/tests/ssnv233a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv233a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv234a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv234a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv234a.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv234b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv234b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/ssnv244a.comm
|
||||
@ -12467,29 +12433,6 @@ aster/%%VE%%/%%DATADIR%%/tests/supv003e.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv003e.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv004a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv004a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005a.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005b.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005c.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005d.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005e.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005e.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005f.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005g.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005g.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005h.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005h.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005i.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005i.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005j.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005j.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005k.2
|
||||
aster/%%VE%%/%%DATADIR%%/tests/supv005k.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/szlz100a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/szlz100a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/szlz101a.comm
|
||||
@ -13913,6 +13856,10 @@ aster/%%VE%%/%%DATADIR%%/tests/zzzz121f.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz121f.datg
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz121f.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz121f.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz122a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz122a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz123a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz123a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz126a.39
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz126a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz126a.export
|
||||
@ -14314,7 +14261,6 @@ aster/%%VE%%/%%DATADIR%%/tests/zzzz274b.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274c.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274d.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz274d.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz282a.41
|
||||
@ -14665,7 +14611,6 @@ aster/%%VE%%/%%DATADIR%%/tests/zzzz341b.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz341b.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz341c.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz341c.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz341c.mail
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz342a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz342a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz342a.mail
|
||||
@ -14980,6 +14925,8 @@ aster/%%VE%%/%%DATADIR%%/tests/zzzz395o.70
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz395o.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz395o.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz395o.mmed
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz395p.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz395p.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz396a.comm
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz396a.export
|
||||
aster/%%VE%%/%%DATADIR%%/tests/zzzz396a.mmed
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= mumps
|
||||
DISTVERSION= 5.1.2-aster6
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 5.1.2-aster7
|
||||
CATEGORIES= math
|
||||
PKGNAMESUFFIX= -edf
|
||||
|
||||
|
||||
@ -328,6 +328,7 @@
|
||||
SUBDIR += szip
|
||||
SUBDIR += teem
|
||||
SUBDIR += tfel
|
||||
SUBDIR += tfel-edf
|
||||
SUBDIR += tinker
|
||||
SUBDIR += udunits
|
||||
SUBDIR += v_sim
|
||||
|
||||
52
science/tfel-edf/Makefile
Normal file
52
science/tfel-edf/Makefile
Normal file
@ -0,0 +1,52 @@
|
||||
# Created by: Pedro F. Giffuni
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tfel
|
||||
DISTVERSION= 3.2.1-1
|
||||
CATEGORIES= science
|
||||
PKGNAMESUFFIX= -mfront-edf
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code generation tool dedicated to material knowledge
|
||||
|
||||
LICENSE= GPLv3
|
||||
|
||||
BUILD_DEPENDS= gnuplot:math/gnuplot \
|
||||
${PYNUMPY}
|
||||
LIB_DEPENDS= ${PY_BOOST} \
|
||||
libboost_thread.so:devel/boost-libs
|
||||
RUN_DEPENDS= gnuplot:math/gnuplot \
|
||||
${PYNUMPY}
|
||||
|
||||
USES= cmake compiler:c++0x fortran localbase python
|
||||
# OK with clang, but does not link with Code_Aster compiled with Gcc
|
||||
USE_GCC= yes
|
||||
|
||||
CONFLICTS= tfel-mfront-3.*
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
OPTIONS_DEFAULT=DOCS
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
|
||||
CMAKE_ON= enable-aster enable-calculix enable-fortran \
|
||||
enable-python enable-python-bindings
|
||||
CMAKE_ARGS+= -DCOMPILER_CXXFLAGS="${CXXFLAGS}" -DCOMPILER_FLAGS="${CFLAGS}"
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
.ifdef PACKAGE_BUILDING
|
||||
CMAKE_ON+= enable-portable-build
|
||||
.endif
|
||||
|
||||
TEST_TARGET= check
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
|
||||
|
||||
post-install:
|
||||
(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
|
||||
-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
|
||||
(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
|
||||
-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
35
science/tfel-edf/files/patch-cmake_modules_tfel.cmake
Normal file
35
science/tfel-edf/files/patch-cmake_modules_tfel.cmake
Normal file
@ -0,0 +1,35 @@
|
||||
--- cmake/modules/tfel.cmake.orig 2019-12-16 14:46:35 UTC
|
||||
+++ cmake/modules/tfel.cmake
|
||||
@@ -21,7 +21,7 @@ macro(tfel_project tfel_version_major tfel_version_min
|
||||
set(TFEL_VERSION "${VERSION}")
|
||||
endif(TFEL_VERSION_FLAVOUR)
|
||||
add_definitions("-DVERSION=\\\"\"${TFEL_VERSION}\"\\\"")
|
||||
-
|
||||
+
|
||||
if(TFEL_APPEND_VERSION)
|
||||
set(TFEL_SUFFIX "${TFEL_VERSION}")
|
||||
add_definitions("-DTFEL_SUFFIX=\\\"\"${TFEL_SUFFIX}\"\\\"")
|
||||
@@ -36,7 +36,7 @@ macro(tfel_project tfel_version_major tfel_version_min
|
||||
string(REPLACE "." "_" TFEL_SUFFIX_FOR_PYTHON_MODULES "${TFEL_SUFFIX}")
|
||||
string(REPLACE "-" "_" TFEL_SUFFIX_FOR_PYTHON_MODULES "${TFEL_SUFFIX_FOR_PYTHON_MODULES}")
|
||||
endif(TFEL_SUFFIX)
|
||||
-
|
||||
+
|
||||
if(LIB_SUFFIX)
|
||||
add_definitions("-DLIB_SUFFIX=\\\"\"${LIB_SUFFIX}\"\\\"")
|
||||
endif(LIB_SUFFIX)
|
||||
@@ -145,8 +145,14 @@ macro(tfel_library_internal name component)
|
||||
endif(${ARGC} LESS 2)
|
||||
add_library(${name} SHARED ${ARGN})
|
||||
if(TFEL_APPEND_SUFFIX)
|
||||
+ set(export_install_path "share/tfel-${TFEL_SUFFIX}/cmake")
|
||||
+ else(TFEL_APPEND_SUFFIX)
|
||||
+ set(export_install_path "share/tfel/cmake")
|
||||
+ endif(TFEL_APPEND_SUFFIX)
|
||||
+ if(TFEL_APPEND_SUFFIX)
|
||||
set_target_properties(${name} PROPERTIES OUTPUT_NAME "${name}-${TFEL_SUFFIX}")
|
||||
endif(TFEL_APPEND_SUFFIX)
|
||||
+ set_target_properties(${name} PROPERTIES VERSION ${TFEL_VERSION} SOVERSION ${TFEL_VERSION_MAJOR})
|
||||
if(WIN32)
|
||||
install(TARGETS ${name} DESTINATION bin
|
||||
COMPONENT ${component})
|
||||
24
science/tfel-edf/pkg-descr
Normal file
24
science/tfel-edf/pkg-descr
Normal file
@ -0,0 +1,24 @@
|
||||
The aim of this version is to work with Code_Aster. If you want to use TFEL/
|
||||
MFront alone, you could get a newer version from science/tfel.
|
||||
|
||||
`MFront` is a code generator which translates a set of closely related
|
||||
domain specific languages into plain C++ on top of the `TFEL`
|
||||
library. Those languages covers three kind of material knowledge:
|
||||
|
||||
- material properties (for instance the
|
||||
Young modulus, the thermal conductivity, etc.)
|
||||
- mechanical behaviours. Numerical performances of
|
||||
generated mechanical behaviours was given a particular
|
||||
attention. Various benchmarks shows that `MFront`
|
||||
implementations are competitive with native implementations
|
||||
available in the `Cast3M`, `Code-Aster` and `Cyrano3` solvers.
|
||||
- simple point-wise models, such as material swelling
|
||||
used in fuel performance codes.
|
||||
|
||||
`MFront` comes with an handy easy-to-use tool called `MTest` that can
|
||||
test the local behaviour of a material, by imposing independent
|
||||
constraints on each component of the strain or the stress. This tool
|
||||
has been much faster (from ten to several hundred times depending on
|
||||
the test case) than using a full-fledged finite element solver.
|
||||
|
||||
WWW: http://tfel.sourceforge.net/
|
||||
2157
science/tfel-edf/pkg-plist
Normal file
2157
science/tfel-edf/pkg-plist
Normal file
File diff suppressed because it is too large
Load Diff
@ -18,6 +18,8 @@ RUN_DEPENDS= gnuplot:math/gnuplot
|
||||
|
||||
USES= cmake compiler:c++0x fortran tar:bzip2
|
||||
|
||||
CONFLICTS= tfel-mfront-edf-3.*
|
||||
|
||||
OPTIONS_DEFINE= DOCS PYTHON
|
||||
OPTIONS_DEFAULT= DOCS PYTHON
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
Remark: if you plan to use this port with Code_Aster, you need science/tfel-edf.
|
||||
|
||||
`MFront` is a code generator which translates a set of closely related
|
||||
domain specific languages into plain C++ on top of the `TFEL`
|
||||
library. Those languages covers three kind of material knowledge:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user