lcal modifs

Elena.Budnik
1 parent 6d56aab2
Showing 4 changed files with 9 additions and 7 deletions Show diff stats
Sources/Makefile
Sources/Prop_code/Makefile
env.sh
runRequest
@@ -5,8 +5,8 @@ include ../env.sh
 # *************************** COMPILER SETTINGS *****************************
 CXX        = g++ 
 CXXFLAGS   = -std=c++11 -pedantic -fPIC -Wall -Wextra
-INCLUDE    = -I${DDDIR}/include/DDClientLibC -I${TINYDIR}/include
-LIB        = -L${DDDIR}/lib -L${TINYDIR}/lib
+INCLUDE    = -I${DD_DIR}/include/DDClientLibC -I${TINYDIR}/include
+LIB        = -L${DD_DIR}/lib -L${TINYDIR}/lib
 LKLIBS     = -lDDClientLibC -ltinyxml -lnetcdf -lm
 LDFLAGS    = -fPIC
 EXE        = get_Orbit get_OMNI_1H get_ACE_RT get_R_LON_HCI WriteDDTime
@@ -14,6 +14,7 @@ EXE        = get_Orbit get_OMNI_1H get_ACE_RT get_R_LON_HCI WriteDDTime
  
 # ******************************** LINKING *********************************
 all: $(EXE)
+	install -d -m a+rx,ug+w ${SW2ROOT}/Bin
 	cp  $(EXE) ../Bin
  
 WriteDDTime: writeDDTime.o
@@ -53,5 +54,5 @@ get_R_LON_HCI.o: get_R_LON_HCI.cpp
  
 # CLEAN
 clean: 
-	rm -rf *.o
-	rm -rf ${EXE}
 \ No newline at end of file
+	rm -f *.o Prop_code/*.o
+	rm -f ${EXE} Prop_code/*.exe
 \ No newline at end of file
@@ -6,6 +6,7 @@ OBJ1=main_sw1da_p.o sub_indat_p.o sub_slct_p.o sub_common.o
 PRO1=main_sw1da_p.f sub_indat_p.f sub_slct_p.f sub_common.f
  
 all: $(EXE1)
+	install -d -m a+rx,ug+w ${SW2ROOT}/Bin
 	cp $(EXE1) ../../Bin/	
  
 $(EXE1): $(OBJ1)
@@ -15,4 +16,4 @@ $(OBJ1): $(PRO1)
 	$(FC) $(CFLAGS) -c $(PRO1)
  
 clean:
-	rm *.o
+	rm *.o $(EXE1}
 #!/bin/bash
  
 # SOFT ROOT
-export SW2ROOT=/home/budnik/SolarWind2
+export SW2ROOT=/home/budnik/SolarWind
  
 export DDUSER=budnik
 export DDPWD=Sacre-Cour
@@ -13,7 +13,7 @@ SwStop=$5
  rm -rf $SW2DATA/temp $SW2DATA/$tgt*
  
  # delete previous requests
- rm $REQ/*.xml 
+ rm -f $REQ/*.xml 
  
  cd $SW2ROOT/Bin.py; python makeRequest.py $tgt $tgt_vi $src_vi $TaoStop $SwStop > $tgt\.log
  DDLogin $DDUSER $DDPWD > ddlog