Index: /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12154) +++ /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12155) @@ -6,7 +6,7 @@ #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,5 +15,5 @@ #Build EnumToStringx.cpp {{{1 #Header -cat < $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp +cat < $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp /* * \file EnumToStringx.cpp: @@ -35,7 +35,7 @@ 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 <> $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp +cat <> $ISSM_DIR/src/c/modules/EnumToStringx/EnumToStringx.cpp default : return "unknown"; @@ -57,5 +57,5 @@ #Build StringToEnumx.cpp {{{1 #Header -cat < $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp +cat < $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp /* * \file StringToEnumx.cpp: @@ -81,9 +81,9 @@ 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,5 +93,5 @@ #footer -cat <> $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp +cat <> $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,5 +127,5 @@ #}}} #Add case to matlabenum file{{{ - cat < $ISSM_TIER"/src/m/enum/"$(echo $NAMEENUM".m") + cat < $ISSM_DIR"/src/m/enum/"$(echo $NAMEENUM".m") function macro=$(echo $NAMEENUM)() %$(echo $NAMEENUM | awk {'print toupper($1)'}) - Enum of $(echo $NAME) Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 12154) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 12155) @@ -6,5 +6,5 @@ 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: */ Index: /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12154) +++ /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12155) @@ -2,5 +2,5 @@ #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,5 +51,5 @@ #Add Verbosity Matlab file{{{ - cat < $ISSM_TIER"/src/m/shared/"$(echo $FILENAME".m") + cat < $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,5 +148,5 @@ #}}} #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 Index: /issm/trunk-jpl/src/m/classes/clusters/generic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 12154) +++ /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 12155) @@ -13,9 +13,9 @@ 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 Index: /issm/trunk-jpl/src/m/classes/clusters/generic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/generic.py (revision 12154) +++ /issm/trunk-jpl/src/m/classes/clusters/generic.py (revision 12155) @@ -16,9 +16,9 @@ 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): Index: /issm/trunk-jpl/src/m/model/modis.m =================================================================== --- /issm/trunk-jpl/src/m/model/modis.m (revision 12154) +++ /issm/trunk-jpl/src/m/model/modis.m (revision 12155) @@ -14,9 +14,9 @@ %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 Index: /issm/trunk-jpl/src/m/model/petscversion.m =================================================================== --- /issm/trunk-jpl/src/m/model/petscversion.m (revision 12154) +++ /issm/trunk-jpl/src/m/model/petscversion.m (revision 12155) @@ -8,5 +8,5 @@ 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!']); Index: /issm/trunk-jpl/src/m/utils/DataProcessing/TracksToMatrix.m =================================================================== --- /issm/trunk-jpl/src/m/utils/DataProcessing/TracksToMatrix.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/DataProcessing/TracksToMatrix.m (revision 12155) @@ -26,5 +26,5 @@ %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,3 +82,3 @@ %remove DACE path -rmpath([issmtier() '/externalpackages/dace/install']); +rmpath([issmdir() '/externalpackages/dace/install']); Index: /issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (revision 12155) @@ -2,9 +2,9 @@ %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')); Index: /issm/trunk-jpl/src/m/utils/OS/ismumps.m =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/ismumps.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/OS/ismumps.m (revision 12155) @@ -6,5 +6,5 @@ -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!']); Index: /issm/trunk-jpl/src/m/utils/OS/ispetsc.m =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/ispetsc.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/OS/ispetsc.m (revision 12155) @@ -6,5 +6,5 @@ -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!']); Index: /issm/trunk-jpl/src/m/utils/OS/issmscpin.m =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/issmscpin.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/OS/issmscpin.m (revision 12155) @@ -32,10 +32,10 @@ %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,5 +43,5 @@ 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'); Index: /issm/trunk-jpl/src/m/utils/OS/issmscpout.m =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/issmscpout.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/OS/issmscpout.m (revision 12155) @@ -23,10 +23,10 @@ %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,5 +34,5 @@ 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'); Index: /issm/trunk-jpl/src/m/utils/OS/issmssh.m =================================================================== --- /issm/trunk-jpl/src/m/utils/OS/issmssh.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/OS/issmssh.m (revision 12155) @@ -15,15 +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 Index: /issm/trunk-jpl/src/m/utils/Shell/flaimdir.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/flaimdir.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/Shell/flaimdir.m (revision 12155) @@ -5,3 +5,3 @@ % FLAIM_DIR=flaimdir() -FLAIM_DIR=[issmtier '/externalpackages/flaim/install']; +FLAIM_DIR=[issmdir '/externalpackages/flaim/install']; Index: /issm/trunk-jpl/src/m/utils/Shell/issmdir.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/issmdir.m (revision 12154) +++ /issm/trunk-jpl/src/m/utils/Shell/issmdir.m (revision 12155) @@ -1,4 +1,4 @@ function ISSM_DIR=issmdir() -%ISSMDIR - Get ISSM_DIR environment variable contents. +%ISSMDIR - Get ISSM_DIR environment variable % % Usage: @@ -9,4 +9,7 @@ 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 Index: sm/trunk-jpl/src/m/utils/Shell/issmtier.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/issmtier.m (revision 12154) +++ (revision ) @@ -1,18 +1,0 @@ -function ISSM_TIER=issmtier() -%ISSMTIER - Get ISSM_TIER environment variable contents. -% -% Usage: -% ISSM_TIER=issmtier() - -if ~ispc, - ISSM_TIER =getenv('ISSM_TIER'); -else - ISSM_TIER =getenv('ISSM_TIER_WIN'); - if strcmpi(ISSM_TIER(end),'/') | strcmpi(ISSM_TIER(end),'\'), - ISSM_TIER = ISSM_TIER(1:end-1); %shave off the last '/' - end -end - -if (isempty(ISSM_TIER)), - error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!'); -end Index: /issm/trunk-jpl/src/m/utils/Shell/jplsvn.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/jplsvn.m (revision 12155) +++ /issm/trunk-jpl/src/m/utils/Shell/jplsvn.m (revision 12155) @@ -0,0 +1,15 @@ +function JPL_SVN=jplsvn() +%ISSMDIR - Get JPL_SVN environment variable +% +% Usage: +% JPL_SVN=jplsvn() + +if ~ispc, + JPL_SVN =getenv('JPL_SVN'); +else + JPL_SVN =getenv('JPL_SVN_WIN'); +end + +if (isempty(JPL_SVN)), + error('jplsvn error message: ''JPL_SVN'' environment variable is empty! You should define JPL_SVN in your .cshrc or .bashrc'); +end Index: /issm/trunk-jpl/src/m/utils/Shell/ucisvn.m =================================================================== --- /issm/trunk-jpl/src/m/utils/Shell/ucisvn.m (revision 12155) +++ /issm/trunk-jpl/src/m/utils/Shell/ucisvn.m (revision 12155) @@ -0,0 +1,15 @@ +function UCI_SVN=ucisvn() +%ISSMDIR - Get UCI_SVN environment variable +% +% Usage: +% UCI_SVN=ucisvn() + +if ~ispc, + UCI_SVN =getenv('UCI_SVN'); +else + UCI_SVN =getenv('UCI_SVN_WIN'); +end + +if (isempty(UCI_SVN)), + error('ucisvn error message: ''UCI_SVN'' environment variable is empty! You should define UCI_SVN in your .cshrc or .bashrc'); +end