Changeset 116

Timestamp:

06/22/06 10:17:23 (18 years ago)

Author:

smasson

Message:

bugfix in triangule + staring point of virtual machine

Location:

trunk/SRC

Files:

• Commons/cm_general.pro (modified) (1 diff)
• Documentation/xmldoc/savesaxo.sh (modified) (4 diffs)
• ForOldVersion/keep_compatibility.pro (modified) (2 diffs)
• ToBeReviewed/TRIANGULATION/triangule.pro (modified) (1 diff)

trunk/SRC/Commons/cm_general.pro

@@ -6 +6 @@
 ;
 COMMON directories, homedir, iodir, animdir, psdir, imagedir, myuniquetmpdir
-COMMON key_general, key_performance, key_forgetold
+COMMON key_general, key_performance, key_forgetold, key_vm
 ;

trunk/SRC/Documentation/xmldoc/savesaxo.sh

@@ -32 +32 @@
 set -u
 #
-docompileall=0
+docompileall=1
 dohtml=0
 dooldtest=0
@@ -38 +38 @@
 doidldoc_html=0
 doidldoc_assistant=0
-doTARsrc=1
+doTARsrc=0
 doTARdata=0
-doforge=1
+doforge=0
 doSRClodyc=0
 doDTAlodyc=0
@@ -283 +283 @@
 fi
 #------------------------------------------------------------------
-if [ $doSRCipsl -eq 1 ]
-then
-    echo "iii : you will be asked ${lgforge}@forge.ipsl.jussieu.fr passwd"
-    infosrc=$(ssh ${lgforge}@forge.ipsl.jussieu.fr ls -lht /ipsl/forge/projets/saxo/download/SAXO_SRC_*.tar.gz  | head -n 1)
-    filesrc=$(echo ${infosrc} | awk '{print $NF}')
-    filesrc=$( basename $filesrc )
-#
-    cat <<EOF > job_src_$$
-#!/bin/bash
-cd SAXO_DIR
-#
-rm -rf SRC
-wget http://forge.ipsl.jussieu.fr/saxo/download/$filesrc
-gunzip $filesrc
-tar vxf $( basename $filesrc .gz )
-rm -f $( basename $filesrc .gz )
-#
-chmod -R 755 *
-exit
-#
-EOF
-fi
-#
 if [[ ($doDTAlodyc -eq 1) || ($doDTAipsl -eq 1) ]]
 then
@@ -346 +323 @@
 if [ $doSRCipsl -eq 1 ]
 then
-# update src on cook
-#
-    echo "iii : update src on cook"
-    scp job_src_$$ smlod@cook.ipsl.jussieu.fr:.
-    ssh smlod@cook.ipsl.jussieu.fr "chmod 755 job_src_$$ ; ./job_src_$$ ; rm -f job_src_$$"
+# update src on calcul2
+#
+    echo "iii : update src on calcul2"
+    ssh smlod@calcul2.ipsl.jussieu.fr "svn update SAXO_DIR/SRC ; chmod -R 755 SAXO_DIR"
 fi
 #------------------------------------------------------------------

trunk/SRC/ForOldVersion/keep_compatibility.pro

@@ -41 +41 @@
     return
   ENDIF
+; are we using the virtual machine??
+  IF n_elements(key_vm) EQ 0 THEN $
+     key_vm = total(file_test(expand_path(!path, /array)+'/keep_compatibility.pro')) EQ 0
 ;
   IF n_elements(myuniquetmpdir) NE 0 THEN BEGIN
@@ -57 +60 @@
 ; 3) define and create myuniquetmpdir and add it to !path
   def_myuniquetmpdir
+; if we are using the virtual machine, there is no need to do this
+  IF NOT keyword_set(key_vm) THEN BEGIN
 ;
 ; 4) copy oldcm_full(_empty) to myuniquetmpdir+'oldcm_used.pro'
 ; select which file should be copied to oldcm_used.pro
-  IF key_forgetold THEN BEGIN 
-    oldcm = find('oldcm_empty')
-    print, 'We forget the compatibility with the old version'
-  ENDIF ELSE BEGIN 
-    oldcm = find('oldcm_full') 
-    print, 'We keep the compatibility with the old version'
-  ENDELSE 
+    IF key_forgetold THEN BEGIN 
+      oldcm = find('oldcm_empty')
+      print, 'We forget the compatibility with the old version'
+    ENDIF ELSE BEGIN 
+      oldcm = find('oldcm_full') 
+      print, 'We keep the compatibility with the old version'
+    ENDELSE 
 ;
-  oldcm = oldcm[0]
-  IF oldcm EQ 'NOT FOUND' THEN BEGIN
-    print, 'Error: oldcm_full or oldcm_empty must be found in the !path'
-    stop
+    oldcm = oldcm[0]
+    IF oldcm EQ 'NOT FOUND' THEN BEGIN
+      print, 'Error: oldcm_full or oldcm_empty must be found in the !path'
+      stop
+    ENDIF
+; copy
+    file_copy, oldcm, myuniquetmpdir + 'oldcm_used.pro', /overwrite
+;
+; make sure we can make the plots even if we are using the demo mode
+;
+    demomode_compatibility
   ENDIF
-; copy
-  file_copy, oldcm, myuniquetmpdir + 'oldcm_used.pro', /overwrite
-;
-; make sure we can make the plots enev if we are using the demo mode
-;
-  demomode_compatibility
 ;
 ;  make sure that the common variables are correctly initialized.

trunk/SRC/ToBeReviewed/TRIANGULATION/triangule.pro

@@ -5 +5 @@
 @common
 ;
-  IF jpi EQ 1 OR jpj EQ 1 THEN return, -1
+  szmsk = size(maskentree)
+  IF szmsk[0] EQ 0 THEN BEGIN
+    nx = jpi
+    ny = jpj
+  ENDIF ELSE BEGIN 
+    nx = szmsk[1]
+    ny = szmsk[2]
+  ENDELSE
+  IF nx EQ 1 OR ny EQ 1 THEN return, -1
 ;
   IF arg_present(coinmonte) THEN coinmonte = 1