Changeset 132


Ignore:
Timestamp:
04/29/09 15:06:00 (16 years ago)
Author:
Eric.Larour
Message:

New mesh2grid solutoin sequence

Location:
issm/trunk
Files:
8 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/autom4te.cache/traces.0

    r1 r132  
    1 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/amversion.m4:20: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
     1m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/amversion.m4:20: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
    22dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    33dnl require some minimum version.  Point them to the right macro.
    … …  
    55      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    66])
    7 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/amversion.m4:37: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.2])dnl
     7m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/amversion.m4:37: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.2])dnl
    88m4_ifndef([AC_AUTOCONF_VERSION],
    99  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    1010_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
    11 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/auxdir.m4:52: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
     11m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/auxdir.m4:52: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
    1212AC_PREREQ([2.50])dnl
    1313# expand $ac_aux_dir to an absolute path
    1414am_aux_dir=`cd $ac_aux_dir && pwd`
    1515])
    16 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/cond.m4:34: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
     16m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/cond.m4:34: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
    1717 ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
    1818        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
    … …  
    3333Usually this means the macro was only invoked conditionally.]])
    3434fi])])
    35 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/depend.m4:132: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
     35m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/depend.m4:132: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
    3636AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
    3737AC_REQUIRE([AM_MAKE_INCLUDE])dnl
    … …  
    137137  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
    138138])
    139 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/depend.m4:142: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
     139m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/depend.m4:142: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
    140140AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
    141141])
    142 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/depend.m4:158: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
     142m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/depend.m4:158: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
    143143[  --disable-dependency-tracking  speeds up one-time build
    144144  --enable-dependency-tracking   do not reject slow dependency extractors])
    … …  
    151151_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
    152152])
    153 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/depout.m4:63: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [# Autoconf 2.62 quotes --file arguments for eval, but not when files
     153m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/depout.m4:63: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [# Autoconf 2.62 quotes --file arguments for eval, but not when files
    154154# are listed without --file.  Let's play safe and only enable the eval
    155155# if we detect the quoting.
    … …  
    200200done
    201201])
    202 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/depout.m4:77: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
     202m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/depout.m4:77: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
    203203     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
    204204     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
    205205])
    206 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
    207 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
     206m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
     207m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
    208208You should run autoupdate.])dnl
    209209AC_CONFIG_HEADERS($@)])
    210 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/init.m4:103: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
     210m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/init.m4:103: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
    211211dnl Autoconf wants to disallow AM_ names.  We explicitly allow
    212212dnl the ones we care about.
    … …  
    285285])
    286286])
    287 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/init.m4:125: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
     287m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/init.m4:125: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
    288288_am_arg=$1
    289289_am_stamp_count=1
    … …  
    297297done
    298298echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
    299 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/install-sh.m4:14: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
     299m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/install-sh.m4:14: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
    300300install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
    301301AC_SUBST(install_sh)])
    302 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/lead-dot.m4:21: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
     302m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/lead-dot.m4:21: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
    303303mkdir .tst 2>/dev/null
    304304if test -d .tst; then
    … …  
    309309rmdir .tst 2>/dev/null
    310310AC_SUBST([am__leading_dot])])
    311 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/make.m4:51: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
     311m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/make.m4:51: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
    312312cat > confinc << 'END'
    313313am__doit:
    … …  
    346346rm -f confinc confmf
    347347])
    348 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/minuso.m4:35: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl
     348m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/minuso.m4:35: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl
    349349AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
    350350AC_REQUIRE_AUX_FILE([compile])dnl
    … …  
    367367          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
    368368])
    369 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/missing.m4:17: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
     369m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/missing.m4:17: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
    370370$1=${$1-"${am_missing_run}$2"}
    371371AC_SUBST($1)])
    372 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/missing.m4:35: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
     372m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/missing.m4:35: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
    373373AC_REQUIRE_AUX_FILE([missing])dnl
    374374test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
    … …  
    381381fi
    382382])
    383 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/mkdirp.m4:26: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
     383m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/mkdirp.m4:26: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
    384384AC_REQUIRE([AC_PROG_MKDIR_P])dnl
    385385dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
    … …  
    396396esac
    397397])
    398 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/options.m4:14: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
    399 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/options.m4:20: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
    400 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/options.m4:26: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
    401 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/options.m4:32: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
    402 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/runlog.m4:17: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
     398m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/options.m4:14: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
     399m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/options.m4:20: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
     400m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/options.m4:26: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
     401m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/options.m4:32: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
     402m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/runlog.m4:17: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
    403403   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
    404404   ac_status=$?
    405405   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    406406   (exit $ac_status); }])
    407 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/sanity.m4:51: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
     407m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/sanity.m4:51: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
    408408# Just in case
    409409sleep 1
    … …  
    442442fi
    443443AC_MSG_RESULT(yes)])
    444 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/strip.m4:28: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
     444m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/strip.m4:28: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
    445445# Installed binaries are usually stripped using `strip' when the user
    446446# run `make install-strip'.  However `strip' might not be the right
    … …  
    453453INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
    454454AC_SUBST([INSTALL_STRIP_PROGRAM])])
    455 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
    456 m4trace:/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/tar.m4:95: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
     455m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
     456m4trace:/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/tar.m4:95: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
    457457AM_MISSING_PROG([AMTAR], [tar])
    458458m4_if([$1], [v7],
    … …  
    16641664m4trace:configure.ac:2: -1- AM_CONFIG_HEADER([config.h])
    16651665m4trace:configure.ac:2: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
    1666 You should run autoupdate.], [/u/wilkes-r1b/larour/Bin/automake/share/aclocal-1.10/header.m4:12: AM_CONFIG_HEADER is expanded from...
     1666You should run autoupdate.], [/u/astrid1/larour/issm/trunk/devpackages/automake/install/share/aclocal-1.10/header.m4:12: AM_CONFIG_HEADER is expanded from...
    16671667configure.ac:2: the top level])
    16681668m4trace:configure.ac:3: -1- m4_pattern_allow([^build$])

  • issm/trunk/src/c/Makefile.am

    r128 r132  
    171171                                        ./Dux/Dux.h\
    172172                                        ./Dux/Dux.cpp\
     173                                        ./GriddataMeshToGridx/GriddataMeshToGridx.h\
     174                                        ./GriddataMeshToGridx/GriddataMeshToGridx.cpp\
    173175                                        ./ControlConstrainx/ControlConstrainx.h\
    174176                                        ./ControlConstrainx/ControlConstrainx.cpp\
    … …  
    389391                                        ./Dux/Dux.h\
    390392                                        ./Dux/Dux.cpp\
     393                                        ./GriddataMeshToGridx/GriddataMeshToGridx.h\
     394                                        ./GriddataMeshToGridx/GriddataMeshToGridx.cpp\
    391395                                        ./ControlConstrainx/ControlConstrainx.h\
    392396                                        ./ControlConstrainx/ControlConstrainx.cpp\

  • issm/trunk/src/c/issm.h

    r117 r132  
    4545#include "./ControlConstrainx/ControlConstrainx.h"
    4646#include "./VelocityExtrudex/VelocityExtrudex.h"
     47#include "./GriddataMeshToGridx/GriddataMeshToGridx.h"
    4748
    4849

  • issm/trunk/src/m/classes/public/ismodelselfconsistent.m

    r64 r132  
    331331end
    332332
     333%MESH2GRID
     334if strcmpi(solutiontype,'mesh2grid'),
     335        if ~strcmpi(md.cluster,'none'),
     336                disp(['model is not correctly configured: mesh2grid not supported in parallel yet!']);
     337                bool=0;return;
     338        end
     339end
     340
     341
    333342%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  PACKAGE CHECKS   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    334343

  • issm/trunk/src/m/classes/public/solve.m

    r43 r132  
    5050usenamespace(package);
    5151
    52 %Check model is self-consistent
    53 if ~strcmpi(solutiontype,'mesh2grid'),
    54         disp(sprintf('\n%s','checking model consistency'));
    55         if ~ismodelselfconsistent(md,solutiontype,package),
     52if ~ismodelselfconsistent(md,solutiontype,package),
    5653                error(' '); %previous error messages should explain what is going on.
    57         end
    5854end
     55
    5956disp('launching solution sequence');
    6057

  • issm/trunk/src/mex/Makefile.am

    r128 r132  
    1515                                Echo\
    1616                                Gradj\
     17                                GriddataMeshToGrid\
    1718                                HoleFiller \
    1819                                Mergesolutionfromftog\
    … …  
    9596                          Gradj/Gradj.h
    9697
     98GriddataMeshToGrid_SOURCES = GriddataMeshToGrid/GriddataMeshToGrid.cpp\
     99                          GriddataMeshToGrid/GriddataMeshToGrid.h
     100
    97101Test_SOURCES = Test/Test.cpp\
    98102                          Test/Test.h
Note: See TracChangeset for help on using the changeset viewer.