Changeset 29 for trunk/ToBeReviewed/TRIANGULATION/triangule_e.pro

Timestamp:

05/02/06 15:32:01 (18 years ago)

Author:

pinsard

Message:

upgrade of TRIANGULATION according to cerbere.lodyc.jussieu.fr: /usr/home/smasson/SAXO_RD/ : files

File:

• trunk/ToBeReviewed/TRIANGULATION/triangule_e.pro (copied) (copied from trunk/TRIANGULATION/triangule_e.pro) (5 diffs)

trunk/ToBeReviewed/TRIANGULATION/triangule_e.pro

@@ -32 +32 @@
 ;------------------------------------------------------------
 FUNCTION triangule_e, maskentree, COINMONTE = coinmonte, COINDESCEND = coindescend $
-                  , SHIFTED = shifted, REGULIER = regulier, PERIODIQUE = periodique
+                  , SHIFTED = shifted, BASIC = basic
+;---------------------------------------------------------
+@cm_4mesh
+  IF NOT keyword_set(key_forgetold) THEN BEGIN
+@updatenew
+  ENDIF
+;---------------------------------------------------------
    tempsun = systime(1)         ; pour key_performance
-@common
-   ;;
 ;------------------------------------------------------------
 ; le masque est donne ou il faut prendre tmask?
@@ -45 +49 @@
    ny = sizem[2]
 ;------------------------------------------------------------
-   if n_elements(periodique) EQ 0 then periodique = keyword_set(key_periodique)
-   if keyword_set(key_periodique) and keyword_set(periodique) $
-    AND NOT keyword_set(regulier) then BEGIN 
+   if keyword_set(key_periodic)*(nx EQ jpi) $
+    AND NOT keyword_set(basic) then BEGIN 
       msk = [msk, msk[0, *]]
       nx = nx+1
@@ -132 +135 @@
 ; ;
 ;------------------------------------------------------------
-; quand key_periodique eq 1, triang est une liste d''indice d'un
+; quand key_periodic eq 1, triang est une liste d''indice d'un
 ; tableau qui a une colonne de trop.
 ; il faut ramener ca a la matrice initiale en mettant les indivces de
@@ -138 +141 @@
 ;------------------------------------------------------------
    tempdeux = systime(1)        ; pour key_performance =2
-   if keyword_set(key_periodique) and keyword_set(periodique) $
-    AND NOT keyword_set(regulier) then BEGIN 
+   if keyword_set(key_periodic)*(nx-1 EQ jpi) $
+    AND NOT keyword_set(basic) then BEGIN 
       indicey = triang/nx
       indicex = triang-indicey*nx
@@ -170 +173 @@
 
 ;------------------------------------------------------------
-;    if arg_present(coinmonte) THEN coinmonte = coinmont ELSE cointerremont = coinmont
-;    if arg_present(coindescend) THEN coindescend = coindesc ELSE cointerredesc = coindesc
+;    if arg_present(coinmonte) THEN coinmonte = coinmont ELSE twin_corners_up = coinmont
+;    if arg_present(coindescend) THEN coindescend = coindesc ELSE twin_corners_dn = coindesc
 ;
-; 
+;   IF NOT keyword_set(key_forgetold) THEN BEGIN
+;    @updateold
+;   ENDIF
 ;------------------------------------------------------------