Changeset 32951

Timestamp:

Dec 13, 2011, 11:44:33 AM (15 years ago)

Author:

eugene

Message:

add spex1dgas

Location:

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• spex1dgas.c (added)
• spex2dgas.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/Makefile

@@ -58 +58 @@
 $(SRC)/spec.$(ARCH).o              \
 $(SRC)/specpairfit.$(ARCH).o       \
+$(SRC)/spex1dgas.$(ARCH).o         \
 $(SRC)/spex2dgas.$(ARCH).o         \
 $(SRC)/mkclusters.$(ARCH).o        \

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/init.c

@@ -46 +46 @@
 int spec                    PROTO((int, char **));
 int specpairfit             PROTO((int, char **));
+int spex1dgas               PROTO((int, char **));
 int spex2dgas               PROTO((int, char **));
 int mkclusters              PROTO((int, char **));
@@ -97 +98 @@
   {1, "spec",        spec,         "extract a spectrum"},
   {1, "specpairfit", specpairfit,  "fit spectrum to another spectrum"},
+  {1, "spex1dgas",   spex1dgas,    "minimize distances in 1D"},
   {1, "spex2dgas",   spex2dgas,    "minimize distances in 2D"},
   {1, "mkclusters",  mkclusters,   "group spectra by distance"},

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/spex2dgas.c

@@ -49 +49 @@
 void sortfriends (float *X, int *IDX1, int N);
 
-void get_pressure_gradient (int iObj, int nCloseMax, float farFrac, int nearNeighbors, float maxPressure) {
+static void get_pressure_gradient (int iObj, int nCloseMax, float farFrac, int nearNeighbors, float maxPressure) {
 
   int i;
@@ -107 +107 @@
 }
 
-void move_object (int iObj) {
+static void move_object (int iObj) {
 
   object[iObj].Xo += 0.25*object[iObj].dPdX;