Changeset 12155

Timestamp:

05/01/12 07:28:25 (13 years ago)

Author:

Mathieu Morlighem

Message:

Changing ISSM_TIER to ISSM_DIR

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/Synchronize.sh (modified) (7 diffs)
• c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (modified) (1 diff)
• c/shared/Numerics/Synchronize.sh (modified) (3 diffs)
• m/classes/clusters/generic.m (modified) (1 diff)
• m/classes/clusters/generic.py (modified) (1 diff)
• m/model/modis.m (modified) (1 diff)
• m/model/petscversion.m (modified) (1 diff)
• m/utils/DataProcessing/TracksToMatrix.m (modified) (2 diffs)
• m/utils/Miscellaneous/issmdoc.m (modified) (1 diff)
• m/utils/OS/ismumps.m (modified) (1 diff)
• m/utils/OS/ispetsc.m (modified) (1 diff)
• m/utils/OS/issmscpin.m (modified) (2 diffs)
• m/utils/OS/issmscpout.m (modified) (2 diffs)
• m/utils/OS/issmssh.m (modified) (1 diff)
• m/utils/Shell/flaimdir.m (modified) (1 diff)
• m/utils/Shell/issmdir.m (modified) (2 diffs)
• m/utils/Shell/issmtier.m (deleted)
• m/utils/Shell/jplsvn.m (added)
• m/utils/Shell/ucisvn.m (added)

issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh ¶

@@ -6 +6 @@
 
 #Removed existing files
-rm $ISSM_TIER/src/m/enum/*.m
-rm $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp
-rm $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp
+rm $ISSM_DIR/src/m/enum/*.m
+rm $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp
+rm $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp
 
 #Get number of enums
@@ -15 +15 @@
 #Build EnumToStringx.cpp {{{1
 #Header
-cat <<END >  $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp
+cat <<END >  $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp
 /*
 * \file EnumToStringx.cpp:
@@ -35 +35 @@
 END
 #core
-cat temp |  awk '{print "\t\t" "case " $2" : return \"" substr($2,1,length($2)-4) "\";"}' >> $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp
+cat temp |  awk '{print "\t\t" "case " $2" : return \"" substr($2,1,length($2)-4) "\";"}' >> $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp
 #Footer
-cat <<END >> $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp
+cat <<END >> $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp
                 default : return "unknown";
 
@@ -57 +57 @@
 #Build StringToEnumx.cpp {{{1
 #Header
-cat <<END > $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp
+cat <<END > $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp
 /*
 * \file StringToEnumx.cpp:
@@ -81 +81 @@
 i2=120;
 for (( i=1 ; i<=100 ; i++ )); do
-        echo "   if(stage==$i){" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
+        echo "   if(stage==$i){" >> $ISSM_DIR//src/c/modules/StringToEnumx/StringToEnumx.cpp
         awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp |
-        awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
-        echo "         else stage=$(($i+1));" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
-        echo "   }" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
+        awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_DIR//src/c/modules/StringToEnumx/StringToEnumx.cpp
+        echo "         else stage=$(($i+1));" >> $ISSM_DIR//src/c/modules/StringToEnumx/StringToEnumx.cpp
+        echo "   }" >> $ISSM_DIR//src/c/modules/StringToEnumx/StringToEnumx.cpp
         
         if [ $i2 -ge $NUMENUMS ]; then break; fi
@@ -93 +93 @@
 
 #footer
-cat <<END >> $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp
+cat <<END >> $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp
         /*If we reach this point, the string provided has not been found*/
    _error_("Enum %s not found",name);
@@ -127 +127 @@
         #}}}
         #Add case to matlabenum file{{{
-        cat <<END > $ISSM_TIER"/src/m/enum/"$(echo $NAMEENUM".m")
+        cat <<END > $ISSM_DIR"/src/m/enum/"$(echo $NAMEENUM".m")
 function macro=$(echo $NAMEENUM)()
 %$(echo $NAMEENUM | awk {'print toupper($1)'}) - Enum of $(echo $NAME)

issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp ¶

@@ -6 +6 @@
 int SegmentIntersect(double* palpha, double* pbeta, double* x1, double* y1, double* x2, double* y2){
 
-        /*See ISSM_TIER/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */
+        /*See ISSM_DIR/src/m/utils/Geometry/SegIntersect.m for matlab routine from which we take this routine: */
 
         /*output: */

issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh ¶

@@ -2 +2 @@
 #Synchronize Verbosity
 #first remove existing files
-rm $ISSM_TIER/src/m/shared/Verb*.m
+rm $ISSM_DIR/src/m/shared/Verb*.m
 
 echo "Synchronizing Verbosity levels..."
@@ -51 +51 @@
 
         #Add Verbosity Matlab file{{{
-        cat <<END > $ISSM_TIER"/src/m/shared/"$(echo $FILENAME".m")
+        cat <<END > $ISSM_DIR"/src/m/shared/"$(echo $FILENAME".m")
 function bool=$(echo $FILENAME)()
 %$(echo $FILENAME | awk {'print toupper($1)'}) - Return true if $(echo $LEVELNAME | awk {'print tolower($1)'}) level is activated
@@ -148 +148 @@
 #}}}
 #Complete verbose.m {{{1
-VERBOSEPATH="$ISSM_TIER/src/m/classes/verbose.m"
+VERBOSEPATH="$ISSM_DIR/src/m/classes/verbose.m"
 cat $VERBOSEPATH  | sed "/%BEGINFIELDS/,$ d"  > temp_begin
 cat $VERBOSEPATH  | sed "1,/%ENDFIELDS/d" > temp_end

issm/trunk-jpl/src/m/classes/clusters/generic.m ¶

@@ -13 +13 @@
                  port=0;
                  interactive=1;
-                 codepath=[issmtier() '/bin'];
-                 executionpath=[issmtier() '/execution'];
-                 valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind'];
-                 valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
-                 valgrindsup=[issmtier() '/externalpackages/valgrind/issm.supp'];
+                 codepath=[issmdir() '/bin'];
+                 executionpath=[issmdir() '/execution'];
+                 valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
+                 valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
+                 valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp'];
                  %}}}
          end

issm/trunk-jpl/src/m/classes/clusters/generic.py ¶

@@ -16 +16 @@
                 self.port=0
                 self.interactive=1
-                self.codepath=issmtier() + '/bin'
-                self.executionpath=issmtier() + '/execution'
-                self.valgrind=issmtier() + '/externalpackages/valgrind/install/bin/valgrind'
-                self.valgrindlib=issmtier() + '/externalpackages/valgrind/install/lib/libmpidebug.so'
-                self.valgrindsup=issmtier() + '/externalpackages/valgrind/issm.supp'
+                self.codepath=issmdir() + '/bin'
+                self.executionpath=issmdir() + '/execution'
+                self.valgrind=issmdir() + '/externalpackages/valgrind/install/bin/valgrind'
+                self.valgrindlib=issmdir() + '/externalpackages/valgrind/install/lib/libmpidebug.so'
+                self.valgrindsup=issmdir() + '/externalpackages/valgrind/issm.supp'
                 #}}}
         def __repr__(obj):

issm/trunk-jpl/src/m/model/modis.m ¶

@@ -14 +14 @@
 
 %Get path  to gdal binaries
-path_gdal=[issmtier() '/externalpackages/gdal/install/bin/'];
+path_gdal=[issmdir() '/externalpackages/gdal/install/bin/'];
 
 %Was gdal compiled? 
 if ~exist([path_gdal 'gdal_translate']),
-        error(['modis error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' issmtier() '/externalpackages/gdal to use this routine.']);
+        error(['modis error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' issmdir() '/externalpackages/gdal to use this routine.']);
 end
 

issm/trunk-jpl/src/m/model/petscversion.m ¶

@@ -8 +8 @@
 PETSC_VERSION=3;
 
-configfile=[issmtier() '/config.h'];
+configfile=[issmdir() '/config.h'];
 if ~exist(configfile,'file'),
         error(['File ' configfile ' not found. ISSM has not been configured yet!']);

issm/trunk-jpl/src/m/utils/DataProcessing/TracksToMatrix.m ¶

@@ -26 +26 @@
 
 %Add path to dace
-addpath([issmtier() '/externalpackages/dace/install'])
+addpath([issmdir() '/externalpackages/dace/install'])
 
 %First create the x_m and y_m fot the matrix
@@ -82 +82 @@
 
 %remove DACE path
-rmpath([issmtier() '/externalpackages/dace/install']);
+rmpath([issmdir() '/externalpackages/dace/install']);

issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m ¶

@@ -2 +2 @@
 
 %First get ISSM tier: 
-ISSM_TIER=issmtier;
+ISSM_DIR=issmdir;
 
 disp(sprintf('\n%s','  A comprehensive documentation is available on http://issm.jpl.nasa.gov'));
 disp(sprintf('\n%s','  Example: how to create a square ice shelf'));
-disp(sprintf('%s','        go to ',ISSM_TIER,'/examples/SquareIceshelf'));
+disp(sprintf('%s','        go to ',ISSM_DIR,'/examples/SquareIceshelf'));
 disp(sprintf('%s','        md=model;                                %creates a new empty model structure'));
 disp(sprintf('%s','        md=triangle(md,''DomainOutline.exp'',50000);   %creates a mesh of the domain outline with a resolution of 50000m'));

issm/trunk-jpl/src/m/utils/OS/ismumps.m ¶

@@ -6 +6 @@
 
 
-configfile=[issmtier() '/bin/config.h']; %should find it in the install target
+configfile=[issmdir() '/bin/config.h']; %should find it in the install target
 if ~exist(configfile,'file'),
         error(['File ' configfile ' not found. ISSM has not been configured yet!']);

issm/trunk-jpl/src/m/utils/OS/ispetsc.m ¶

@@ -6 +6 @@
 
 
-configfile=[issmtier() '/bin/config.h']; %should find it in the install target
+configfile=[issmdir() '/bin/config.h']; %should find it in the install target
 if ~exist(configfile,'file'),
         error(['File ' configfile ' not found. ISSM has not been configured yet!']);

issm/trunk-jpl/src/m/utils/OS/issmscpin.m ¶

@@ -32 +32 @@
                 %use the putty project pscp.exe: it should be in the path.
                 
-                %get ISSM_TIER variable
-                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
+                %get ISSM_DIR variable
+                [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
                 if status, 
-                        error('scpin error message: could not find ISSM_TIER_WIN envirnoment variable');
+                        error('scpin error message: could not find ISSM_DIR_WIN envirnoment variable');
                 end
-                ISSM_TIER=ISSM_TIER(2:end-2);
+                ISSM_DIR=ISSM_DIR(2:end-2);
 
                 username=input('Username: (quoted string) ');
@@ -43 +43 @@
 
                 for i=1:numel(packages),
-                        [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' key '" ' host ':' path '/' packages{i} ' ./']);
+                        [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' key '" ' host ':' path '/' packages{i} ' ./']);
                         if status, 
                                 error('scpin error message: could not call putty pscp');

issm/trunk-jpl/src/m/utils/OS/issmscpout.m ¶

@@ -23 +23 @@
                 %use the putty project pscp.exe: it should be in the path.
                 
-                %get ISSM_TIER variable
-                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
+                %get ISSM_DIR variable
+                [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
                 if status, 
-                        error('scpout error message: could not find ISSM_TIER_WIN envirnoment variable');
+                        error('scpout error message: could not find ISSM_DIR_WIN envirnoment variable');
                 end
-                ISSM_TIER=ISSM_TIER(2:end-2);
+                ISSM_DIR=ISSM_DIR(2:end-2);
 
                 username=input('Username: (quoted string) ');
@@ -34 +34 @@
 
                 for i=1:numel(packages),
-                        [status,result]=system([ISSM_TIER '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' key '" ' packages{i} ' ' host ':' path]);
+                        [status,result]=system([ISSM_DIR '/externalpackages/ssh/pscp.exe -l "' username '" -pw "' key '" ' packages{i} ' ' host ':' path]);
                         if status, 
                                 error('scpout error message: could not call putty pscp');

issm/trunk-jpl/src/m/utils/OS/issmssh.m ¶

@@ -15 +15 @@
                 %use the putty project plink.exe: it should be in the path.
                 
-                %get ISSM_TIER variable
-                [status,ISSM_TIER]=system('echo [%ISSM_TIER_WIN%]');
+                %get ISSM_DIR variable
+                [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]');
                 if status, 
-                        error('issmssh error message: could not find ISSM_TIER_WIN envirnoment variable');
+                        error('issmssh error message: could not find ISSM_DIR_WIN envirnoment variable');
                 end
-                ISSM_TIER=ISSM_TIER(2:end-2);
+                ISSM_DIR=ISSM_DIR(2:end-2);
 
                 username=input('Username: (quoted string) ');
                 key=input('Key: (quoted string) ');
 
-                system([ISSM_TIER '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' key '" ' host ' "' command '"']);
+                system([ISSM_DIR '/externalpackages/ssh/plink.exe -ssh -l "' username '" -pw "' key '" ' host ' "' command '"']);
 
         else

issm/trunk-jpl/src/m/utils/Shell/flaimdir.m ¶

@@ -5 +5 @@
 %      FLAIM_DIR=flaimdir()
 
-FLAIM_DIR=[issmtier '/externalpackages/flaim/install'];
+FLAIM_DIR=[issmdir '/externalpackages/flaim/install'];

issm/trunk-jpl/src/m/utils/Shell/issmdir.m ¶

@@ -1 +1 @@
 function ISSM_DIR=issmdir()
-%ISSMDIR - Get ISSM_DIR environment variable contents.
+%ISSMDIR - Get ISSM_DIR environment variable
 %
 %   Usage:
@@ -9 +9 @@
 else
         ISSM_DIR =getenv('ISSM_DIR_WIN');
+        if strcmpi(ISSM_DIR(end),'/') | strcmpi(ISSM_DIR(end),'\'),
+                ISSM_DIR = ISSM_DIR(1:end-1); %shave off the last '/'
+        end
 end