Skip to content

Commit

Permalink
[masa]: wow, might actually be working. Glorious.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasmalaya committed Jul 9, 2013
1 parent 83638c0 commit 778d4c6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 23 deletions.
8 changes: 6 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ _masa_la_LDFLAGS = -module
_masa_la_LIBADD = ../src/libmasa.la

$(srcdir)/masa_wrap.c : $(SWIG_SOURCES)
$(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir)/src -o $@ $<
$(SWIG) $(SWIG_PYTHON_OPT) -o $@ $<
$(SWIG) -c++ -python $(SWIG_PYTHON_OPT) masa.i

#masa.py: masa.i
# $(MAKE) masa_wrap.c

#-----------------------
# Standalone binaries
Expand Down Expand Up @@ -91,4 +95,4 @@ uninstall-local: libfmasa.la
rm -rf $(DESTDIR)$(libdir)/masa.mod

EXTRA_DIST = lic_utils/update_license.pl .license.stamp
CLEANFILES = .license.stamp masa.mod *.gcda *.gcno
CLEANFILES = .license.stamp masa.mod *.gcda *.gcno masa_wrap.c masa.py
21 changes: 0 additions & 21 deletions src/masa.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -1167,13 +1167,6 @@ extern "C" {
// v-component
//

/**
* This subroutine returns the gradient of the analytical solution
* for the v-component of velocity.
* It should be called for solutions with a single dimension.
*/
extern double masa_eval_1d_grad_v(double x);

/**
* This subroutine returns the gradient of the analytical solution
* for the v-component of velocity.
Expand All @@ -1192,20 +1185,6 @@ extern "C" {
// w-component
//

/**
* This subroutine returns the gradient of the analytical solution
* for the w-component of velocity.
* It should be called for solutions with a single dimension.
*/
extern double masa_eval_1d_grad_w(double x);

/**
* This subroutine returns the gradient of the analytical solution
* for the w-component of velocity.
* It should be called for solutions with two dimensions.
*/
extern double masa_eval_2d_grad_w(double x,double y,int direction);

/**
* This subroutine returns the gradient of the analytical solution
* for the w-component of velocity.
Expand Down

0 comments on commit 778d4c6

Please sign in to comment.