CDPP / AMDA_IHM

Commit af97ef5688793c11a1e4a0600276bf0edc7105c9

Authored by Elena.Budnik
1 parent 2de6f07c
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

make C executables in php/src

Showing 4 changed files with 27 additions and 10 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @af97ef5
... ... @@ -9,4 +9,5 @@ generic_data/ParamTemplate/
9 9 generic_data/ParamInfo/*.xml
10 10 js/lib/ext/
11 11 help/
  12 +php/bin
12 13 *~
... ...
install-scripts.sh 0 → 100755
  Diff comments   View file @af97ef5
... ... @@ -0,0 +1,15 @@
  1 +#!/bin/bash
  2 +
  3 +# script to compile/install php/src C executables
  4 +
  5 +# AMDA_IHM installation root
  6 +export IHM_DIR=/home/budnik/AMDA/AMDA_IHM
  7 +
  8 +export CDF_DIR=/usr/local/cdf
  9 +export CEF_DIR=/usr/local/cef
  10 +export DD_LIB=/usr/local/DDClient/lib
  11 +export DD_INCLUDE=/usr/local/DDClient/include/DDClientLibC
  12 +
  13 +cd $IHM_DIR/php/src && make clean && make && make install && make clean
  14 +cd $IHM_DIR
  15 +
... ...
php/src/Makefile
  Diff comments   View file @af97ef5
1   -INC = -I/usr/include -I/usr/local/include -I/usr/local/cdf/include -I/usr/local/cef/include -I/home/budnik/AMDANEW/DDLIB/include
2   -LIB = -L/usr/lib -L/usr/local/lib -L/usr/local/cdf/lib -L/usr/local/cef/lib -L/home/budnik/AMDANEW/DDLIB/lib
3   -CFLAGS = -ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double
  1 +INC = -I/usr/include -I/usr/local/include -I${CDF_DIR}/include -I${CEF_DIR}/include -I${DD_INCLUDE}
  2 +LIB = -L/usr/lib64 -L/usr/local/lib64 -L${CDF_DIR}/lib -L${CEF_DIR}/lib -L${DD_LIB}
  3 +CFLAGS = -ggdb -DLINUX -m64 -march=core2 -fPIC -Dlinux -D_REENTRANT -malign-double
4 4 CC = gcc
5 5  
6 6 EXE = nctimestring2double nctimeinfo getncvars ncvarinfo \
7 7 cefstartstop cefvarinfo cefinfo cefsampling ceftimeinfo \
8 8 cdfinfo cdfvarinfo cdfstartstopfromdata cdfsamplingfromdata
9 9  
10   -lib: $(EXE)
  10 +lib: ${EXE}
11 11  
12 12 nctimestring2double: nctimestring2double.o
13   - ${CC} -o nctimestring2double nctimestring2double.o ${LIB} -lDD -lnetcdf
  13 + ${CC} -o nctimestring2double nctimestring2double.o ${LIB} -lDDClientLibC -lnetcdf
14 14  
15 15 nctimestring2double.o: nctimestring2double.c
16 16 ${CC} ${CFLAGS} -c nctimestring2double.c ${INC}
... ... @@ -88,11 +88,12 @@ cdfsamplingfromdata.o: cdfsamplingfromdata.c
88 88 ${CC} ${CFLAGS} -c cdfsamplingfromdata.c ${INC}
89 89  
90 90 install:
91   - cp $(EXE) ../bin
  91 + install -d -m a+rx,ug+w ${IHM_DIR}/php/bin
  92 + cp ${EXE} ${IHM_DIR}/php/bin
92 93  
93 94 clean:
94 95 tag="*.o ${EXE}";\
95   - for file in $$tag; do \
  96 + for file in $$tag; do \
96 97 echo $$file; rm -f $$file;\
97 98 done
98   - find -name \*~ -delete
99 99 \ No newline at end of file
  100 + find -name \*~ -delete
... ...
php/src/nctimeinfo.c
  Diff comments   View file @af97ef5
... ... @@ -55,7 +55,7 @@ main(int argc, char **argv)
55 55  
56 56 for (i = 0; i < 2; i++) {
57 57 sampling = time_double[i+1] - time_double[i];
58   - if (sampling < sampling_min) sampling_min = sampling;
  58 + if (sampling < sampling_min && sampling > 0.0) sampling_min = sampling;
59 59 }
60 60  
61 61 printf("%lf:", time_double[0]);
... ... @@ -69,7 +69,7 @@ main(int argc, char **argv)
69 69  
70 70 for (i = 0; i < 2; i++) {
71 71 sampling = time_double[i+1] - time_double[i];
72   - if (sampling < sampling_min) sampling_min = sampling;
  72 + if (sampling < sampling_min && sampling > 0.0) sampling_min = sampling;
73 73 }
74 74  
75 75 printf("%lf", sampling_min);
... ...