diff options
Diffstat (limited to 'externals/grill/vasp/source')
23 files changed, 60 insertions, 57 deletions
diff --git a/externals/grill/vasp/source/classes.h b/externals/grill/vasp/source/classes.h index 7ce64c74..9096b3f8 100644 --- a/externals/grill/vasp/source/classes.h +++ b/externals/grill/vasp/source/classes.h @@ -271,7 +271,7 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB(name ",vasp",vasp_##op) + FLEXT_LIB(name ", vasp_" #op,vasp_##op) #define VASP_BINARY(name,op,to,def,help) \ @@ -290,7 +290,7 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB_V(name ",vasp",vasp_##op) +FLEXT_LIB_V(name ", vasp_" #op,vasp_##op) #define VASP_ANYOP(name,op,args,to,def,help) \ @@ -309,7 +309,10 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB_V(name ",vasp",vasp_##op) +FLEXT_LIB_V(name ", vasp_" #op,vasp_##op) + +#define VASP_LIB(name,cl) FLEXT_LIB(name ", " #cl,cl); +#define VASP_LIB_V(name,cl) FLEXT_LIB_V(name ", " #cl,cl); #define VASP__SETUP(op) FLEXT_SETUP(vasp_##op); diff --git a/externals/grill/vasp/source/main.cpp b/externals/grill/vasp/source/main.cpp index a6588df7..38febd4a 100644 --- a/externals/grill/vasp/source/main.cpp +++ b/externals/grill/vasp/source/main.cpp @@ -22,7 +22,7 @@ static V vasp_main() post("-----------------------------------------"); post(" VASP modular %s ",VASP_VERSION); post(" vector assembling signal processor "); - post(" (C)2002-2005 Thomas Grill "); + post(" (C)2002-2007 Thomas Grill "); #ifdef FLEXT_DEBUG post(" DEBUG BUILD - " __DATE__ " " __TIME__); #endif diff --git a/externals/grill/vasp/source/obj_chns.cpp b/externals/grill/vasp/source/obj_chns.cpp index e5293118..1e7dfb67 100755 --- a/externals/grill/vasp/source/obj_chns.cpp +++ b/externals/grill/vasp/source/obj_chns.cpp @@ -68,7 +68,7 @@ private: FLEXT_ATTRGET_I(ix); }; -FLEXT_LIB_V("vasp.channel vasp.c, vasp",vasp_channel) +VASP_LIB_V("vasp.channel vasp.c",vasp_channel) @@ -111,7 +111,7 @@ public: virtual V m_help() { post("%s - Get channel index of 0th vector in vasp",thisName()); } }; -FLEXT_LIB("vasp.channel? vasp.c?, vasp",vasp_qchannel) +VASP_LIB("vasp.channel? vasp.c?",vasp_qchannel) /*! \class vasp_qchannels @@ -154,7 +154,7 @@ public: virtual V m_help() { post("%s - Get channel index of 0th vector in vasp",thisName()); } }; -FLEXT_LIB("vasp.channels?, vasp",vasp_qchannels) +VASP_LIB("vasp.channels?",vasp_qchannels) diff --git a/externals/grill/vasp/source/obj_frames.cpp b/externals/grill/vasp/source/obj_frames.cpp index 8cc406c6..875bcdc6 100644 --- a/externals/grill/vasp/source/obj_frames.cpp +++ b/externals/grill/vasp/source/obj_frames.cpp @@ -77,7 +77,7 @@ private: FLEXT_ATTRGET_I(frms); }; -FLEXT_LIB_V("vasp.frames vasp.f, vasp",vasp_frames) +VASP_LIB_V("vasp.frames vasp.f",vasp_frames) @@ -113,7 +113,7 @@ public: virtual V m_help() { post("%s - Raise/lower a vasp's frame count",thisName()); } }; -FLEXT_LIB_V("vasp.frames+ vasp.f+, vasp",vasp_dframes) +VASP_LIB_V("vasp.frames+ vasp.f+",vasp_dframes) @@ -166,7 +166,7 @@ protected: FLEXT_ATTRGET_F(factor); }; -FLEXT_LIB_V("vasp.frames* vasp.f*, vasp",vasp_mframes) +VASP_LIB_V("vasp.frames* vasp.f*",vasp_mframes) @@ -199,7 +199,7 @@ public: virtual V m_help() { post("%s - Divide a vasp's frame count",thisName()); } }; -FLEXT_LIB_V("vasp.frames/ vasp.f/, vasp",vasp_rframes) +VASP_LIB_V("vasp.frames/ vasp.f/",vasp_rframes) @@ -236,6 +236,6 @@ public: virtual V m_help() { post("%s - Get a vasp's frame count",thisName()); } }; -FLEXT_LIB("vasp.frames? vasp.f?, vasp",vasp_qframes) +VASP_LIB("vasp.frames? vasp.f?",vasp_qframes) diff --git a/externals/grill/vasp/source/obj_imm.cpp b/externals/grill/vasp/source/obj_imm.cpp index 52b0e89e..258d5049 100644 --- a/externals/grill/vasp/source/obj_imm.cpp +++ b/externals/grill/vasp/source/obj_imm.cpp @@ -118,6 +118,6 @@ private: FLEXT_ATTRVAR_B(zero); }; -FLEXT_LIB_V("vasp.imm vasp.!, vasp",vasp_imm) +VASP_LIB_V("vasp.imm vasp.!",vasp_imm) diff --git a/externals/grill/vasp/source/obj_offs.cpp b/externals/grill/vasp/source/obj_offs.cpp index 9efa2fb5..6e1a584e 100644 --- a/externals/grill/vasp/source/obj_offs.cpp +++ b/externals/grill/vasp/source/obj_offs.cpp @@ -76,7 +76,7 @@ private: FLEXT_ATTRGET_I(offs); }; -FLEXT_LIB_V("vasp.offset vasp.o, vasp",vasp_offset) +VASP_LIB_V("vasp.offset vasp.o",vasp_offset) @@ -112,7 +112,7 @@ public: virtual V m_help() { post("%s - Shift a vasp's offset(s) into the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.offset+ vasp.o+, vasp",vasp_doffset) +VASP_LIB_V("vasp.offset+ vasp.o+",vasp_doffset) @@ -175,5 +175,5 @@ public: virtual V m_help() { post("%s - Get a single vectored vasp's offset into the buffer",thisName()); } }; -FLEXT_LIB("vasp.offset? vasp.o?, vasp",vasp_qoffset) +VASP_LIB("vasp.offset? vasp.o?",vasp_qoffset) diff --git a/externals/grill/vasp/source/obj_part.cpp b/externals/grill/vasp/source/obj_part.cpp index 1db6ec42..59c79db3 100644 --- a/externals/grill/vasp/source/obj_part.cpp +++ b/externals/grill/vasp/source/obj_part.cpp @@ -110,6 +110,6 @@ protected: FLEXT_CALLVAR_V(m_getpart,m_setpart); }; -FLEXT_LIB_V("vasp.part, vasp",vasp_part) +VASP_LIB_V("vasp.part",vasp_part) diff --git a/externals/grill/vasp/source/obj_peaks.cpp b/externals/grill/vasp/source/obj_peaks.cpp index be83348b..2a22979b 100644 --- a/externals/grill/vasp/source/obj_peaks.cpp +++ b/externals/grill/vasp/source/obj_peaks.cpp @@ -114,6 +114,6 @@ private: FLEXT_ATTRGET_I(peaks); }; -FLEXT_LIB_V("vasp.peaks?, vasp",vasp_qpeaks) +VASP_LIB_V("vasp.peaks?",vasp_qpeaks) diff --git a/externals/grill/vasp/source/obj_q.cpp b/externals/grill/vasp/source/obj_q.cpp index 7b10bab9..9756f4a4 100644 --- a/externals/grill/vasp/source/obj_q.cpp +++ b/externals/grill/vasp/source/obj_q.cpp @@ -59,7 +59,7 @@ public: virtual V m_help() { post("%s - Get list of samples of a vasp vector",thisName()); } }; -FLEXT_LIB("vasp.list vasp.?, vasp",vasp_list) +VASP_LIB("vasp.list vasp.?",vasp_list) @@ -120,5 +120,5 @@ public: virtual V m_help() { post("%s - Get list of non-zero samples of a vasp vector",thisName()); } }; -FLEXT_LIB("vasp.nonzero vasp.??, vasp",vasp_nonzero) +VASP_LIB("vasp.nonzero vasp.??",vasp_nonzero) diff --git a/externals/grill/vasp/source/obj_radio.cpp b/externals/grill/vasp/source/obj_radio.cpp index 435060ad..8932e801 100644 --- a/externals/grill/vasp/source/obj_radio.cpp +++ b/externals/grill/vasp/source/obj_radio.cpp @@ -49,7 +49,7 @@ private: FLEXT_CALLBACK_A(m_any); }; -FLEXT_LIB("vasp.radio, vasp",vasp_radio) +VASP_LIB("vasp.radio",vasp_radio) V vasp_radio::m_any(const t_symbol *s,I argc,const t_atom *argv) diff --git a/externals/grill/vasp/source/obj_size.cpp b/externals/grill/vasp/source/obj_size.cpp index 99d05860..af4ba62e 100644 --- a/externals/grill/vasp/source/obj_size.cpp +++ b/externals/grill/vasp/source/obj_size.cpp @@ -81,7 +81,7 @@ private: FLEXT_ATTRVAR_B(zero); }; -FLEXT_LIB_V("vasp.size vasp.s, vasp",vasp_size) +VASP_LIB_V("vasp.size vasp.s",vasp_size) @@ -117,7 +117,7 @@ public: virtual V m_help() { post("%s - Increase the size of the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.size+ vasp.s+, vasp",vasp_dsize) +VASP_LIB_V("vasp.size+ vasp.s+",vasp_dsize) @@ -170,7 +170,7 @@ protected: FLEXT_ATTRGET_F(factor); }; -FLEXT_LIB_V("vasp.size* vasp.s*, vasp",vasp_msize) +VASP_LIB_V("vasp.size* vasp.s*",vasp_msize) @@ -203,7 +203,7 @@ public: virtual V m_help() { post("%s - Divide the size of the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.size/ vasp.s/, vasp",vasp_rsize) +VASP_LIB_V("vasp.size/ vasp.s/",vasp_rsize) @@ -261,5 +261,5 @@ public: virtual V m_help() { post("%s - Get the buffer size of a vector",thisName()); } }; -FLEXT_LIB("vasp.size? vasp.s?, vasp",vasp_qsize) +VASP_LIB("vasp.size? vasp.s?",vasp_qsize) diff --git a/externals/grill/vasp/source/obj_split.cpp b/externals/grill/vasp/source/obj_split.cpp index c39a15ca..341179d4 100644 --- a/externals/grill/vasp/source/obj_split.cpp +++ b/externals/grill/vasp/source/obj_split.cpp @@ -72,7 +72,7 @@ public: virtual V m_help() { post("%s - Split a vasp into its vectors",thisName()); } }; -FLEXT_LIB_V("vasp.split, vasp",vasp_split) +VASP_LIB_V("vasp.split",vasp_split) /*! \class vasp_join @@ -155,7 +155,7 @@ private: FLEXT_CALLBACK(m_reset) }; -FLEXT_LIB_V("vasp.join, vasp",vasp_join) +VASP_LIB_V("vasp.join",vasp_join) @@ -212,7 +212,7 @@ public: virtual V m_help() { post("%s - Spit out vectors of a vasp",thisName()); } }; -FLEXT_LIB_V("vasp.spit, vasp",vasp_spit) +VASP_LIB_V("vasp.spit",vasp_spit) /*! \class vasp_gather @@ -284,7 +284,7 @@ private: FLEXT_CALLBACK_V(m_add) }; -FLEXT_LIB_V("vasp.gather, vasp",vasp_gather) +VASP_LIB_V("vasp.gather",vasp_gather) diff --git a/externals/grill/vasp/source/obj_sync.cpp b/externals/grill/vasp/source/obj_sync.cpp index bfb02515..b6ad0963 100644 --- a/externals/grill/vasp/source/obj_sync.cpp +++ b/externals/grill/vasp/source/obj_sync.cpp @@ -125,6 +125,6 @@ private: FLEXT_CALLBACK(m_reset) }; -FLEXT_LIB_V("vasp.sync, vasp",vasp_sync) +VASP_LIB_V("vasp.sync",vasp_sync) diff --git a/externals/grill/vasp/source/obj_vasp.cpp b/externals/grill/vasp/source/obj_vasp.cpp index fa6958cc..9b8cfb5d 100644 --- a/externals/grill/vasp/source/obj_vasp.cpp +++ b/externals/grill/vasp/source/obj_vasp.cpp @@ -62,7 +62,7 @@ private: FLEXT_CALLBACK_V(a_radio); }; -FLEXT_LIB_V("vasp, vasp",vasp_v) +VASP_LIB_V("vasp",vasp_v) @@ -98,7 +98,7 @@ public: virtual V m_help() { post("%s - Update graphics of a vasp",thisName()); } }; -FLEXT_LIB("vasp.update vasp.u, vasp",vasp_update) +VASP_LIB("vasp.update vasp.u",vasp_update) @@ -151,7 +151,7 @@ public: virtual V m_help() { post("%s - Check vasp dimensions",thisName()); } }; -FLEXT_LIB("vasp.check vasp.chk, vasp",vasp_check) +VASP_LIB("vasp.check vasp.chk",vasp_check) @@ -201,5 +201,5 @@ public: virtual V m_help() { post("%s - Output a vasp multiple times",thisName()); } }; -FLEXT_LIB_V("vasp.multi vasp.m, vasp",vasp_multi) +VASP_LIB_V("vasp.multi vasp.m",vasp_multi) diff --git a/externals/grill/vasp/source/obj_vecs.cpp b/externals/grill/vasp/source/obj_vecs.cpp index 27ed7290..d056189e 100644 --- a/externals/grill/vasp/source/obj_vecs.cpp +++ b/externals/grill/vasp/source/obj_vecs.cpp @@ -66,7 +66,7 @@ private: FLEXT_ATTRGET_I(ix); }; -FLEXT_LIB_V("vasp.vector vasp.n, vasp",vasp_vector) +VASP_LIB_V("vasp.vector vasp.n",vasp_vector) @@ -105,7 +105,7 @@ public: virtual V m_help() { post("%s - Get number of vectors of a vasp",thisName()); } }; -FLEXT_LIB("vasp.vectors? vasp.n?, vasp",vasp_qvectors) +VASP_LIB("vasp.vectors? vasp.n?",vasp_qvectors) diff --git a/externals/grill/vasp/source/ops_arith.cpp b/externals/grill/vasp/source/ops_arith.cpp index 0358bc22..eb05f8a0 100644 --- a/externals/grill/vasp/source/ops_arith.cpp +++ b/externals/grill/vasp/source/ops_arith.cpp @@ -75,5 +75,5 @@ public: virtual V m_help() { post("%s - Get the sum of a vasp's sample values",thisName()); } }; -FLEXT_LIB("vasp.sum?, vasp",vasp_qsum) +VASP_LIB("vasp.sum?",vasp_qsum) diff --git a/externals/grill/vasp/source/ops_assign.cpp b/externals/grill/vasp/source/ops_assign.cpp index 534e0da4..e0adc444 100644 --- a/externals/grill/vasp/source/ops_assign.cpp +++ b/externals/grill/vasp/source/ops_assign.cpp @@ -75,7 +75,7 @@ public: virtual V m_help() { post("%s - Copies the triggering vasp to the argument vasp",thisName()); } }; -FLEXT_LIB_V("vasp.copy vasp.->, vasp",vasp_copy) +VASP_LIB_V("vasp.copy vasp.->",vasp_copy) class vasp_ccopy: @@ -90,6 +90,6 @@ public: virtual V m_help() { post("%s - Copies complex pairs of the triggering vasp to the argument vasp",thisName()); } }; -FLEXT_LIB_V("vasp.ccopy vasp.c->, vasp",vasp_ccopy) +VASP_LIB_V("vasp.ccopy vasp.c->",vasp_ccopy) diff --git a/externals/grill/vasp/source/ops_cmp.cpp b/externals/grill/vasp/source/ops_cmp.cpp index f2c2ac4d..34b7a98a 100644 --- a/externals/grill/vasp/source/ops_cmp.cpp +++ b/externals/grill/vasp/source/ops_cmp.cpp @@ -39,7 +39,7 @@ VASP_BINARY("vasp.rmax",rmax,true,VASP_ARG_R(0),"assigns the maximum of the radi // -------------------------------------------------------------- -VASP_UNARY("vasp, vasp.minmax",minmax,true,"compare two vectors, assign the lower values to the first and the higher to the second one") +VASP_UNARY("vasp.minmax",minmax,true,"compare two vectors, assign the lower values to the first and the higher to the second one") diff --git a/externals/grill/vasp/source/ops_feature.cpp b/externals/grill/vasp/source/ops_feature.cpp index 44d106bd..89e3a156 100644 --- a/externals/grill/vasp/source/ops_feature.cpp +++ b/externals/grill/vasp/source/ops_feature.cpp @@ -171,7 +171,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for peaks",thisName()); } }; -FLEXT_LIB_V("vasp.peaks, vasp",vasp_peaks) +VASP_LIB_V("vasp.peaks",vasp_peaks) class vasp_valleys: @@ -188,7 +188,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for values",thisName()); } }; -FLEXT_LIB_V("vasp.valleys, vasp",vasp_valleys) +VASP_LIB_V("vasp.valleys",vasp_valleys) class vasp_rpeaks: @@ -205,7 +205,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for peaks of the complex radius",thisName()); } }; -FLEXT_LIB_V("vasp.rpeaks, vasp",vasp_rpeaks) +VASP_LIB_V("vasp.rpeaks",vasp_rpeaks) class vasp_rvalleys: @@ -222,5 +222,5 @@ public: virtual V m_help() { post("%s - Get non-zero values only for valleys of the complex radius",thisName()); } }; -FLEXT_LIB_V("vasp.rvalleys, vasp",vasp_rvalleys) +VASP_LIB_V("vasp.rvalleys",vasp_rvalleys) diff --git a/externals/grill/vasp/source/ops_qminmax.cpp b/externals/grill/vasp/source/ops_qminmax.cpp index 70e2680d..22ae6128 100644 --- a/externals/grill/vasp/source/ops_qminmax.cpp +++ b/externals/grill/vasp/source/ops_qminmax.cpp @@ -68,7 +68,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum sample value",thisName()); } }; -FLEXT_LIB("vasp.min?, vasp",vasp_qmin) +VASP_LIB("vasp.min?",vasp_qmin) /*! \class vasp_qamin @@ -100,7 +100,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum absolute sample value",thisName()); } }; -FLEXT_LIB("vasp.amin?, vasp",vasp_qamin) +VASP_LIB("vasp.amin?",vasp_qamin) @@ -133,7 +133,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum sample value",thisName()); } }; -FLEXT_LIB("vasp.max?, vasp",vasp_qmax) +VASP_LIB("vasp.max?",vasp_qmax) @@ -166,7 +166,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum absolute sample value",thisName()); } }; -FLEXT_LIB("vasp.amax?, vasp",vasp_qamax) +VASP_LIB("vasp.amax?",vasp_qamax) @@ -227,7 +227,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum complex radius",thisName()); } }; -FLEXT_LIB("vasp.rmin?, vasp",vasp_qrmin) +VASP_LIB("vasp.rmin?",vasp_qrmin) @@ -260,7 +260,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum complex radius",thisName()); } }; -FLEXT_LIB("vasp.rmax?, vasp",vasp_qrmax) +VASP_LIB("vasp.rmax?",vasp_qrmax) diff --git a/externals/grill/vasp/source/ops_rearr.cpp b/externals/grill/vasp/source/ops_rearr.cpp index a17eb03c..fc86b327 100644 --- a/externals/grill/vasp/source/ops_rearr.cpp +++ b/externals/grill/vasp/source/ops_rearr.cpp @@ -140,7 +140,7 @@ protected: private: FLEXT_ATTRVAR_E(fill,xs_fill) }; -FLEXT_LIB_V("vasp.shift, vasp",vasp_shift) +VASP_LIB_V("vasp.shift",vasp_shift) class vasp_xshift: @@ -159,7 +159,7 @@ public: virtual V m_help() { post("%s - Shifts buffer data symmetrically (in two halves)",thisName()); } }; -FLEXT_LIB_V("vasp.xshift, vasp",vasp_xshift) +VASP_LIB_V("vasp.xshift",vasp_xshift) inline int rotation(int ij, int n,OpParam &p) { return (ij+n-p.sh.ish)%n; } diff --git a/externals/grill/vasp/source/ops_resmp.cpp b/externals/grill/vasp/source/ops_resmp.cpp index 41466bf3..b37dd8dc 100644 --- a/externals/grill/vasp/source/ops_resmp.cpp +++ b/externals/grill/vasp/source/ops_resmp.cpp @@ -251,7 +251,7 @@ private: FLEXT_ATTRVAR_E(fill,xt_fill) FLEXT_ATTRVAR_E(inter,xt_inter) }; -FLEXT_LIB_V("vasp.tilt, vasp",vasp_tilt) +VASP_LIB_V("vasp.tilt",vasp_tilt) class vasp_xtilt: @@ -270,6 +270,6 @@ public: virtual V m_help() { post("%s - Resamples buffer data symmetrically (in two halves)",thisName()); } }; -FLEXT_LIB_V("vasp.xtilt, vasp",vasp_xtilt) +VASP_LIB_V("vasp.xtilt",vasp_xtilt) diff --git a/externals/grill/vasp/source/ops_search.cpp b/externals/grill/vasp/source/ops_search.cpp index 0157d469..cf7e7df3 100644 --- a/externals/grill/vasp/source/ops_search.cpp +++ b/externals/grill/vasp/source/ops_search.cpp @@ -191,7 +191,7 @@ public: virtual V m_help() { post("%s - Define starting point by searching for given value",thisName()); } }; -FLEXT_LIB_V("vasp.offset= vasp.o=, vasp",vasp_soffset) +VASP_LIB_V("vasp.offset= vasp.o=",vasp_soffset) class vasp_sframes: @@ -208,6 +208,6 @@ public: virtual V m_help() { post("%s - Define vasp frame length by searching for given value",thisName()); } }; -FLEXT_LIB_V("vasp.frames= vasp.f=, vasp",vasp_sframes) +VASP_LIB_V("vasp.frames= vasp.f=",vasp_sframes) |