Changeset 45 for trunk/src

Timestamp:

04/13/11 17:18:24 (13 years ago)

Author:

pinsard

Message:

correction for SAXO environment

Location:

trunk/src

Files:

• tropflux_init.pro (modified) (5 diffs)
• tropflux_profile.sh (modified) (12 diffs)

trunk/src/tropflux_init.pro

@@ -3 +3 @@
 ; .. _tropflux_init.pro:
 ;
-; =================
-; tropflux_init.pro
-; =================
+; ==========================================
+; tropflux_init.pro -- init SAXO environment
+; ==========================================
 ;
 ; DESCRIPTION
@@ -11 +11 @@
 ;
 ; This is the SAXO initialisation file.
-; it defines the !path and the defaut values of some of the common variables
-;
 ;
 ; It ++::
@@ -42 +40 @@
 ; ==========
 ;
+; $URL$
+;
+; - fplod 20110413T151541Z cratos.locean-ipsl.upmc.fr (Linux)
+;
+;   * fix uncompleted replacement SAXO_SRC by SAXO_DIR
+;
+; - fplod 20110413T070801Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * replace SAXO_SRC by SAXO_DIR
+;
 ; - fplod 20110411T074056Z aedon.locean-ipsl.upmc.fr (Darwin)
 ;
@@ -54 +62 @@
 ; 
 ; SAXO environment
-saxo_src_env=GETENV('SAXO_SRC')
+saxo_dir_env=GETENV('SAXO_DIR')
 ; tropflux environment
 @cm_tropflux
@@ -60 +68 @@
 tropflux_id_env=GETENV('TROPFLUX_ID')
 tropflux_od_env=GETENV('TROPFLUX_OD')
-
+;
 ; path definition
 ;
 !path = expand_path('+' + tropflux_env + '/src') $
-      + path_sep(/search_path) + expand_path('+' + saxo_src_env) $
+      + path_sep(/search_path) + expand_path('+' + saxo_dir_env) $
       + path_sep(/search_path) + expand_path('+' + !dir)
 ;

trunk/src/tropflux_profile.sh

@@ -1 @@
-#! /bin/sh
+#! /bin/sh -x
 #+
 #
@@ -15 +15 @@
 # Online usage::
 #
-#  $ . ./tropflux_profile.sh -d directory -i indir -o outdir -t tempdir -s saxo_src
+#  $ . ./tropflux_profile.sh -d directory -i indir -o outdir -t tempdir -s saxo_dir
 #
 # In ${HOME}/.profile, add the following line::
 #
-#  . tropflux_profile.sh -d directory  -i indir -o outdir -t tempdir -s saxo_src
+#  . tropflux_profile.sh -d directory  -i indir -o outdir -t tempdir -s saxo_dir
 #
 # DESCRIPTION
@@ -28 +28 @@
 # .. option:: -o  <outdir>
 # .. option:: -t  <tempdir>
-# .. option:: -s  <saxo_src>
+# .. option:: -s  <saxo_dir>
 #
 # define TROPFLUX environment
@@ -40 +40 @@
 # ${TROPFLUX_OD} is the directory where output files will be written.
 #
-# ${SAXO_SRC} is the base directory of SAXO tools
+# ${SAXO_DIR} is the base directory of SAXO tools
 #
 # PATH is completed with ${TROPFLUX}.
@@ -47 +47 @@
 # ========
 #
-# :ref:`troflux_init.pro`
+# :ref:`tropflux_init.pro`
+#
+# :ref:`cm_tropflux.pro`
 #
 # EXAMPLES
@@ -60 +62 @@
 #    -o /usr/temp/${LOGNAME}/tropflux_d/ \
 #    -t /usr/temp/${LOGNAME}/log/ \
-#    -s /usr/home/fplod/SAXO_DIR/SRC/
+#    -s /usr/home/fplod/SAXO_DIR/
 #
 # For fplod on cratos.locean-ipsl.umpc.fr::
@@ -70 +72 @@
 #    -o /usr/temp/${LOGNAME}/tropflux_d/ \
 #    -t /usr/temp/${LOGNAME}/log/ \
-#    -s ${HOME}/SAXO_DIR/SRC/
+#    -s ${HOME}/SAXO_DIR/
 #
 # For pinsard on camelot.ipsl.polytechnique.fr or merlin15-c.climserv::
@@ -80 +82 @@
 #   -o /homedata/${LOGNAME}/tropflux_d/ \
 #   -t /homedata/${LOGNAME}/log/
-#   -s ${HOME}/SAXO_DIR/SRC/
+#   -s ${HOME}/SAXO_DIR/
 #
 # TODO
@@ -93 +95 @@
 # ++ pas de MANPATH defini par défaut sur zeus et cerbere
 #
-# define IDL startup file
-#
 # EVOLUTIONS
 # ==========
+#
+# - fplod 20110413T151541Z cratos.locean-ipsl.upmc.fr (Linux)
+#
+#   * fix uncompleted replacement SAXO_SRC by SAXO_DIR
 #
 # - fplod 20101118T171653Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -119 +123 @@
 command=tropflux_profile.sh
 #
-usage=" Usage : ${command} -d directory -i indir -o outdir -t tempdir -s saxo_src"
+usage=" Usage : ${command} -d directory -i indir -o outdir -t tempdir -s saxo_dir"
 #
 set +u
@@ -147 +151 @@
       -s)
          # directory for SAXO tools
-         saxo_src=${2}
+         saxo_dir=${2}
          shift
       ;;
@@ -280 +284 @@
 fi
 #
-SAXO_SRC=${saxo_src}
-export SAXO_SRC
-unset saxo_src
+SAXO_DIR=${saxo_dir}
+export SAXO_DIR
+unset saxo_dir
 #
 # end