| [13394] | 1 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.py
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.py (revision 12943)
|
|---|
| 4 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.py (revision 12944)
|
|---|
| 5 | @@ -10,27 +10,27 @@
|
|---|
| 6 | """
|
|---|
| 7 | SOLVE - apply solution sequence for this model
|
|---|
| 8 |
|
|---|
| 9 | - Usage:
|
|---|
| 10 | - md=solve(md,solutionenum,varargin)
|
|---|
| 11 | - where varargin is a list of paired arguments of string OR enums
|
|---|
| 12 | + Usage:
|
|---|
| 13 | + md=solve(md,solutionenum,varargin)
|
|---|
| 14 | + where varargin is a list of paired arguments of string OR enums
|
|---|
| 15 |
|
|---|
| 16 | - solution types available comprise:
|
|---|
| 17 | - - DiagnosticSolutionEnum
|
|---|
| 18 | - - PrognosticSolutionEnum
|
|---|
| 19 | - - ThermalSolutionEnum
|
|---|
| 20 | - - SteadystateSolutionEnum
|
|---|
| 21 | - - TransientSolutionEnum...
|
|---|
| 22 | - - BalancethicknessSolutionEnum
|
|---|
| 23 | - - BedSlopeSolutionEnum
|
|---|
| 24 | - - SurfaceSlopeSolutionEnum
|
|---|
| 25 | - - HydrologySolutionEnum
|
|---|
| 26 | - - FlaimSolutionEnum
|
|---|
| 27 | + solution types available comprise:
|
|---|
| 28 | + - DiagnosticSolutionEnum
|
|---|
| 29 | + - PrognosticSolutionEnum
|
|---|
| 30 | + - ThermalSolutionEnum
|
|---|
| 31 | + - SteadystateSolutionEnum
|
|---|
| 32 | + - TransientSolutionEnum...
|
|---|
| 33 | + - BalancethicknessSolutionEnum
|
|---|
| 34 | + - BedSlopeSolutionEnum
|
|---|
| 35 | + - SurfaceSlopeSolutionEnum
|
|---|
| 36 | + - HydrologySolutionEnum
|
|---|
| 37 | + - FlaimSolutionEnum
|
|---|
| 38 |
|
|---|
| 39 | extra options:
|
|---|
| 40 | - - loadonly : does not solve. only load results
|
|---|
| 41 | + - loadonly : does not solve. only load results
|
|---|
| 42 |
|
|---|
| 43 | - Examples:
|
|---|
| 44 | - md=solve(md,DiagnosticSolutionEnum);
|
|---|
| 45 | + Examples:
|
|---|
| 46 | + md=solve(md,DiagnosticSolutionEnum);
|
|---|
| 47 | """
|
|---|
| 48 |
|
|---|
| 49 | #recover and process solve options
|
|---|
| 50 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/process_solve_options.py
|
|---|
| 51 | ===================================================================
|
|---|
| 52 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/process_solve_options.py (revision 12943)
|
|---|
| 53 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/process_solve_options.py (revision 12944)
|
|---|
| 54 | @@ -5,10 +5,10 @@
|
|---|
| 55 | """
|
|---|
| 56 | DEFAULT_SOLVE_OPTIONS - set up default options for solve phase
|
|---|
| 57 |
|
|---|
| 58 | - Usage:
|
|---|
| 59 | - options=process_solve_options(options)
|
|---|
| 60 | + Usage:
|
|---|
| 61 | + options=process_solve_options(options)
|
|---|
| 62 |
|
|---|
| 63 | - See also: SOLVE
|
|---|
| 64 | + See also: SOLVE
|
|---|
| 65 | """
|
|---|
| 66 |
|
|---|
| 67 | outoptions={}
|
|---|
| 68 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py
|
|---|
| 69 | ===================================================================
|
|---|
| 70 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py (revision 12943)
|
|---|
| 71 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py (revision 12944)
|
|---|
| 72 | @@ -4,11 +4,11 @@
|
|---|
| 73 | """
|
|---|
| 74 | MARSHALL - outputs a compatible binary file from @model md, for certain solution type.
|
|---|
| 75 |
|
|---|
| 76 | - The routine creates a compatible binary file from @model md
|
|---|
| 77 | - This binary file will be used for parallel runs in JPL-package
|
|---|
| 78 | + The routine creates a compatible binary file from @model md
|
|---|
| 79 | + This binary file will be used for parallel runs in JPL-package
|
|---|
| 80 |
|
|---|
| 81 | - Usage:
|
|---|
| 82 | - marshall(md)
|
|---|
| 83 | + Usage:
|
|---|
| 84 | + marshall(md)
|
|---|
| 85 | """
|
|---|
| 86 |
|
|---|
| 87 | print "marshalling file '%s.bin'." % md.miscellaneous.name
|
|---|
| 88 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/AnalysisConfiguration.py
|
|---|
| 89 | ===================================================================
|
|---|
| 90 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/AnalysisConfiguration.py (revision 12943)
|
|---|
| 91 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/AnalysisConfiguration.py (revision 12944)
|
|---|
| 92 | @@ -4,8 +4,8 @@
|
|---|
| 93 | """
|
|---|
| 94 | ANALYSISCONFIGURATION - return type of analyses, number of analyses
|
|---|
| 95 |
|
|---|
| 96 | - Usage:
|
|---|
| 97 | - [analyses, numanalyses]=AnalysisConfiguration(solutiontype);
|
|---|
| 98 | + Usage:
|
|---|
| 99 | + [analyses, numanalyses]=AnalysisConfiguration(solutiontype);
|
|---|
| 100 | """
|
|---|
| 101 |
|
|---|
| 102 | if solutiontype == DiagnosticSolutionEnum:
|
|---|
| 103 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py
|
|---|
| 104 | ===================================================================
|
|---|
| 105 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py (revision 12943)
|
|---|
| 106 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py (revision 12944)
|
|---|
| 107 | @@ -2,8 +2,8 @@
|
|---|
| 108 | """
|
|---|
| 109 | PROCESSPATCH - create a structure from a patch
|
|---|
| 110 |
|
|---|
| 111 | - Usage:
|
|---|
| 112 | - Result=ProcessPatch(Result);
|
|---|
| 113 | + Usage:
|
|---|
| 114 | + Result=ProcessPatch(Result);
|
|---|
| 115 | """
|
|---|
| 116 |
|
|---|
| 117 | #loop over steps
|
|---|
| 118 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/setflowequation.py
|
|---|
| 119 | ===================================================================
|
|---|
| 120 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/setflowequation.py (revision 12943)
|
|---|
| 121 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/setflowequation.py (revision 12944)
|
|---|
| 122 | @@ -8,22 +8,22 @@
|
|---|
| 123 | """
|
|---|
| 124 | SETELEMENTSTYPE - associate a solution type to each element
|
|---|
| 125 |
|
|---|
| 126 | - This routine works like plotmodel: it works with an even number of inputs
|
|---|
| 127 | - 'hutter','macayeal','pattyn','stokes' and 'fill' are the possible options
|
|---|
| 128 | - that must be followed by the corresponding exp file or flags list
|
|---|
| 129 | - It can either be a domain file (argus type, .exp extension), or an array of element flags.
|
|---|
| 130 | - If user wants every element outside the domain to be
|
|---|
| 131 | - setflowequationd, add '~' to the name of the domain file (ex: '~Pattyn.exp');
|
|---|
| 132 | - an empty string '' will be considered as an empty domain
|
|---|
| 133 | - a string 'all' will be considered as the entire domain
|
|---|
| 134 | - You can specify the type of coupling, 'penalties' or 'tiling', to use with the input 'coupling'
|
|---|
| 135 | + This routine works like plotmodel: it works with an even number of inputs
|
|---|
| 136 | + 'hutter','macayeal','pattyn','stokes' and 'fill' are the possible options
|
|---|
| 137 | + that must be followed by the corresponding exp file or flags list
|
|---|
| 138 | + It can either be a domain file (argus type, .exp extension), or an array of element flags.
|
|---|
| 139 | + If user wants every element outside the domain to be
|
|---|
| 140 | + setflowequationd, add '~' to the name of the domain file (ex: '~Pattyn.exp');
|
|---|
| 141 | + an empty string '' will be considered as an empty domain
|
|---|
| 142 | + a string 'all' will be considered as the entire domain
|
|---|
| 143 | + You can specify the type of coupling, 'penalties' or 'tiling', to use with the input 'coupling'
|
|---|
| 144 |
|
|---|
| 145 | - Usage:
|
|---|
| 146 | - md=setflowequation(md,varargin)
|
|---|
| 147 | + Usage:
|
|---|
| 148 | + md=setflowequation(md,varargin)
|
|---|
| 149 |
|
|---|
| 150 | - Example:
|
|---|
| 151 | - md=setflowequation(md,'pattyn','Pattyn.exp','macayeal',md.mask.elementonfloatingice,'fill','hutter');
|
|---|
| 152 | - md=setflowequation(md,'pattyn','Pattyn.exp',fill','hutter','coupling','tiling');
|
|---|
| 153 | + Example:
|
|---|
| 154 | + md=setflowequation(md,'pattyn','Pattyn.exp','macayeal',md.mask.elementonfloatingice,'fill','hutter');
|
|---|
| 155 | + md=setflowequation(md,'pattyn','Pattyn.exp',fill','hutter','coupling','tiling');
|
|---|
| 156 | """
|
|---|
| 157 |
|
|---|
| 158 | #some checks on list of arguments
|
|---|
| 159 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py
|
|---|
| 160 | ===================================================================
|
|---|
| 161 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py (revision 12943)
|
|---|
| 162 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py (revision 12944)
|
|---|
| 163 | @@ -4,8 +4,8 @@
|
|---|
| 164 | """
|
|---|
| 165 | LOADRESULTSFROMDISK - load results of solution sequence from disk file "filename"
|
|---|
| 166 |
|
|---|
| 167 | - Usage:
|
|---|
| 168 | - md=loadresultsfromdisk(md=False,filename=False);
|
|---|
| 169 | + Usage:
|
|---|
| 170 | + md=loadresultsfromdisk(md=False,filename=False);
|
|---|
| 171 | """
|
|---|
| 172 |
|
|---|
| 173 | #check number of inputs/outputs
|
|---|
| 174 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/waitonlock.py
|
|---|
| 175 | ===================================================================
|
|---|
| 176 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/waitonlock.py (revision 12943)
|
|---|
| 177 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/waitonlock.py (revision 12944)
|
|---|
| 178 | @@ -7,11 +7,11 @@
|
|---|
| 179 | """
|
|---|
| 180 | WAITONLOCK - wait for a file
|
|---|
| 181 |
|
|---|
| 182 | - This routine will return when a file named 'filename' is written to disk.
|
|---|
| 183 | - If the time limit given in input is exceeded, return 0
|
|---|
| 184 | + This routine will return when a file named 'filename' is written to disk.
|
|---|
| 185 | + If the time limit given in input is exceeded, return 0
|
|---|
| 186 |
|
|---|
| 187 | - Usage:
|
|---|
| 188 | - flag=waitonlock(md,executionpath)
|
|---|
| 189 | + Usage:
|
|---|
| 190 | + flag=waitonlock(md,executionpath)
|
|---|
| 191 | """
|
|---|
| 192 |
|
|---|
| 193 | #Get filename (lock file) and options
|
|---|
| 194 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/recover_areas.py
|
|---|
| 195 | ===================================================================
|
|---|
| 196 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/recover_areas.py (revision 12943)
|
|---|
| 197 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/recover_areas.py (revision 12944)
|
|---|
| 198 | @@ -5,10 +5,10 @@
|
|---|
| 199 | """
|
|---|
| 200 | RECOVER_AREAS - flag the element depending on the physical model that is assigned to them
|
|---|
| 201 |
|
|---|
| 202 | - This routine is called by setelementstype, do not use
|
|---|
| 203 | + This routine is called by setelementstype, do not use
|
|---|
| 204 |
|
|---|
| 205 | - Usage:
|
|---|
| 206 | - [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
|
|---|
| 207 | + Usage:
|
|---|
| 208 | + [hutterflag macayealflag pattynflag stokesflag filltype]=recover_areas(md,varargin);
|
|---|
| 209 | """
|
|---|
| 210 |
|
|---|
| 211 | #go through varargin, extract options and plug them into subtype options, by order of appearance
|
|---|
| 212 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/WriteData.py
|
|---|
| 213 | ===================================================================
|
|---|
| 214 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/WriteData.py (revision 12943)
|
|---|
| 215 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/WriteData.py (revision 12944)
|
|---|
| 216 | @@ -7,8 +7,8 @@
|
|---|
| 217 | """
|
|---|
| 218 | WRITEDATA - write model field in binary file
|
|---|
| 219 |
|
|---|
| 220 | - Usage:
|
|---|
| 221 | - WriteData(fid,varargin)
|
|---|
| 222 | + Usage:
|
|---|
| 223 | + WriteData(fid,varargin)
|
|---|
| 224 | """
|
|---|
| 225 |
|
|---|
| 226 | #process options
|
|---|
| 227 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py
|
|---|
| 228 | ===================================================================
|
|---|
| 229 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py (revision 12943)
|
|---|
| 230 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py (revision 12944)
|
|---|
| 231 | @@ -7,8 +7,8 @@
|
|---|
| 232 | """
|
|---|
| 233 | LOADRESULTSFROMCLUSTER - load results of solution sequence from cluster
|
|---|
| 234 |
|
|---|
| 235 | - Usage:
|
|---|
| 236 | - md=loadresultsfromcluster(md,runtimename);
|
|---|
| 237 | + Usage:
|
|---|
| 238 | + md=loadresultsfromcluster(md,runtimename);
|
|---|
| 239 | """
|
|---|
| 240 |
|
|---|
| 241 | #retrieve cluster, to be able to call its methods
|
|---|
| 242 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parameterization/parameterize.py
|
|---|
| 243 | ===================================================================
|
|---|
| 244 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parameterization/parameterize.py (revision 12943)
|
|---|
| 245 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parameterization/parameterize.py (revision 12944)
|
|---|
| 246 | @@ -5,16 +5,16 @@
|
|---|
| 247 | def parameterize(md,parametername):
|
|---|
| 248 | """
|
|---|
| 249 | PARAMETERIZE - parameterize a model
|
|---|
| 250 | -
|
|---|
| 251 | - from a parameter python file, start filling in all the model fields that were not
|
|---|
| 252 | - filled in by the mesh.py and mask.py model methods.
|
|---|
| 253 | - Warning: the parameter file must be able to be run in Python
|
|---|
| 254 | -
|
|---|
| 255 | - Usage:
|
|---|
| 256 | - md=parameterize(md,parametername)
|
|---|
| 257 | -
|
|---|
| 258 | - Example:
|
|---|
| 259 | - md=parameterize(md,'Square.par');
|
|---|
| 260 | +
|
|---|
| 261 | + from a parameter python file, start filling in all the model fields that were not
|
|---|
| 262 | + filled in by the mesh.py and mask.py model methods.
|
|---|
| 263 | + Warning: the parameter file must be able to be run in Python
|
|---|
| 264 | +
|
|---|
| 265 | + Usage:
|
|---|
| 266 | + md=parameterize(md,parametername)
|
|---|
| 267 | +
|
|---|
| 268 | + Example:
|
|---|
| 269 | + md=parameterize(md,'Square.par');
|
|---|
| 270 | """
|
|---|
| 271 |
|
|---|
| 272 | #some checks
|
|---|
| 273 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py
|
|---|
| 274 | ===================================================================
|
|---|
| 275 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py (revision 12943)
|
|---|
| 276 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py (revision 12944)
|
|---|
| 277 | @@ -6,9 +6,9 @@
|
|---|
| 278 | def parseresultsfromdisk(filename,iosplit):
|
|---|
| 279 | """
|
|---|
| 280 | PARSERESULTSFROMDISK - ...
|
|---|
| 281 | -
|
|---|
| 282 | - Usage:
|
|---|
| 283 | - results=parseresultsfromdisk(filename,iosplit)
|
|---|
| 284 | +
|
|---|
| 285 | + Usage:
|
|---|
| 286 | + results=parseresultsfromdisk(filename,iosplit)
|
|---|
| 287 | """
|
|---|
| 288 |
|
|---|
| 289 | if iosplit:
|
|---|
| 290 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/addnote.py
|
|---|
| 291 | ===================================================================
|
|---|
| 292 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/addnote.py (revision 12943)
|
|---|
| 293 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/addnote.py (revision 12944)
|
|---|
| 294 | @@ -1,12 +1,12 @@
|
|---|
| 295 | def addnote(md,string):
|
|---|
| 296 | """
|
|---|
| 297 | ADDNOTE - add a note to the existing model notes field
|
|---|
| 298 | -
|
|---|
| 299 | - Usage:
|
|---|
| 300 | - md=addnote(md,string);
|
|---|
| 301 | -
|
|---|
| 302 | - Example:
|
|---|
| 303 | - md=addnote(md,'Pine Island, Geometry of 2007');
|
|---|
| 304 | +
|
|---|
| 305 | + Usage:
|
|---|
| 306 | + md=addnote(md,string);
|
|---|
| 307 | +
|
|---|
| 308 | + Example:
|
|---|
| 309 | + md=addnote(md,'Pine Island, Geometry of 2007');
|
|---|
| 310 | """
|
|---|
| 311 |
|
|---|
| 312 | if not isinstance(string,str):
|
|---|
| 313 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/ismodelselfconsistent.py
|
|---|
| 314 | ===================================================================
|
|---|
| 315 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/ismodelselfconsistent.py (revision 12943)
|
|---|
| 316 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/ismodelselfconsistent.py (revision 12944)
|
|---|
| 317 | @@ -4,8 +4,8 @@
|
|---|
| 318 | """
|
|---|
| 319 | ISMODELSELFCONSISTENT - check that model forms a closed form solvable problem.
|
|---|
| 320 |
|
|---|
| 321 | - Usage:
|
|---|
| 322 | - ismodelselfconsistent(md),
|
|---|
| 323 | + Usage:
|
|---|
| 324 | + ismodelselfconsistent(md),
|
|---|
| 325 | """
|
|---|
| 326 |
|
|---|
| 327 | #initialize consistency as true
|
|---|
| 328 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/petscversion.py
|
|---|
| 329 | ===================================================================
|
|---|
| 330 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/petscversion.py (revision 12943)
|
|---|
| 331 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/petscversion.py (revision 12944)
|
|---|
| 332 | @@ -6,8 +6,8 @@
|
|---|
| 333 | """
|
|---|
| 334 | PETSCVERSION - recover petsc version number, inside config.h file
|
|---|
| 335 |
|
|---|
| 336 | - Usage:
|
|---|
| 337 | - PETSC_VERSION=petscversion();
|
|---|
| 338 | + Usage:
|
|---|
| 339 | + PETSC_VERSION=petscversion();
|
|---|
| 340 | """
|
|---|
| 341 |
|
|---|
| 342 | #default
|
|---|
| 343 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py
|
|---|
| 344 | ===================================================================
|
|---|
| 345 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py (revision 12943)
|
|---|
| 346 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py (revision 12944)
|
|---|
| 347 | @@ -9,9 +9,7 @@
|
|---|
| 348 | """
|
|---|
| 349 | SCPIN get packages from host, using scp on unix, and pscp on windows
|
|---|
| 350 |
|
|---|
| 351 | - usage: scpin(host,packages,path)
|
|---|
| 352 | -
|
|---|
| 353 | -
|
|---|
| 354 | + usage: scpin(host,packages,path)
|
|---|
| 355 | """
|
|---|
| 356 |
|
|---|
| 357 | #first get hostname
|
|---|
| 358 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py
|
|---|
| 359 | ===================================================================
|
|---|
| 360 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py (revision 12943)
|
|---|
| 361 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py (revision 12944)
|
|---|
| 362 | @@ -9,9 +9,7 @@
|
|---|
| 363 | """
|
|---|
| 364 | SCPOUT send packages to a host, using scp on unix, and pscp on windows
|
|---|
| 365 |
|
|---|
| 366 | - usage: scpout(host,path,packages)
|
|---|
| 367 | -
|
|---|
| 368 | -
|
|---|
| 369 | + usage: scpout(host,path,packages)
|
|---|
| 370 | """
|
|---|
| 371 |
|
|---|
| 372 | #get hostname
|
|---|
| 373 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py
|
|---|
| 374 | ===================================================================
|
|---|
| 375 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py (revision 12943)
|
|---|
| 376 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py (revision 12944)
|
|---|
| 377 | @@ -8,8 +8,8 @@
|
|---|
| 378 | """
|
|---|
| 379 | ISSMSSH - wrapper for OS independent ssh command.
|
|---|
| 380 |
|
|---|
| 381 | - usage:
|
|---|
| 382 | - issmssh(host,command)
|
|---|
| 383 | + usage:
|
|---|
| 384 | + issmssh(host,command)
|
|---|
| 385 | """
|
|---|
| 386 |
|
|---|
| 387 | #first get hostname
|
|---|
| 388 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py
|
|---|
| 389 | ===================================================================
|
|---|
| 390 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 12943)
|
|---|
| 391 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 12944)
|
|---|
| 392 | @@ -6,8 +6,8 @@
|
|---|
| 393 | """
|
|---|
| 394 | ISPETSC - figure out if PETSC package was compiled with ISSM
|
|---|
| 395 |
|
|---|
| 396 | - Usage:
|
|---|
| 397 | - flag=ispetsc();
|
|---|
| 398 | + Usage:
|
|---|
| 399 | + flag=ispetsc();
|
|---|
| 400 | """
|
|---|
| 401 |
|
|---|
| 402 | configfile=os.path.join(issmdir(),'bin','config.h') #should find it in the install target
|
|---|
| 403 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ismumps.py
|
|---|
| 404 | ===================================================================
|
|---|
| 405 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ismumps.py (revision 12943)
|
|---|
| 406 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ismumps.py (revision 12944)
|
|---|
| 407 | @@ -6,8 +6,8 @@
|
|---|
| 408 | """
|
|---|
| 409 | ISMUMPS - figure out if MUMPS package was compiled with ISSM
|
|---|
| 410 |
|
|---|
| 411 | - Usage:
|
|---|
| 412 | - flag=ismumps();
|
|---|
| 413 | + Usage:
|
|---|
| 414 | + flag=ismumps();
|
|---|
| 415 | """
|
|---|
| 416 |
|
|---|
| 417 | configfile=os.path.join(issmdir(),'bin','config.h') #should find it in the install target
|
|---|
| 418 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Cluster/parallelrange.py
|
|---|
| 419 | ===================================================================
|
|---|
| 420 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Cluster/parallelrange.py (revision 12943)
|
|---|
| 421 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Cluster/parallelrange.py (revision 12944)
|
|---|
| 422 | @@ -3,8 +3,8 @@
|
|---|
| 423 | """
|
|---|
| 424 | PARALLELRANGE - from a rank, and a number of processors, figure out a range, for parallel tasks.
|
|---|
| 425 |
|
|---|
| 426 | - Usage:
|
|---|
| 427 | - i1,i2=parallelrange(rank,numprocs,globalsize)
|
|---|
| 428 | + Usage:
|
|---|
| 429 | + i1,i2=parallelrange(rank,numprocs,globalsize)
|
|---|
| 430 | """
|
|---|
| 431 |
|
|---|
| 432 | #We use floor. we under distribute rows. The rows left are then redistributed, therefore resulting in a more even distribution.
|
|---|
| 433 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/BC/SetIceShelfBC.py
|
|---|
| 434 | ===================================================================
|
|---|
| 435 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/BC/SetIceShelfBC.py (revision 12943)
|
|---|
| 436 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/BC/SetIceShelfBC.py (revision 12944)
|
|---|
| 437 | @@ -4,19 +4,19 @@
|
|---|
| 438 | def SetIceShelfBC(md,icefrontfile=''):
|
|---|
| 439 | """
|
|---|
| 440 | SETICESHELFBC - Create the boundary conditions for diagnostic and thermal models for a Ice Shelf with Ice Front
|
|---|
| 441 | -
|
|---|
| 442 | - Neumann BC are used on the ice front (an ANRGUS contour around the ice front
|
|---|
| 443 | - must be given in input)
|
|---|
| 444 | - Dirichlet BC are used elsewhere for diagnostic
|
|---|
| 445 | -
|
|---|
| 446 | - Usage:
|
|---|
| 447 | - md=SetIceShelfBC(md,varargin)
|
|---|
| 448 | -
|
|---|
| 449 | - Example:
|
|---|
| 450 | - md=SetIceShelfBC(md);
|
|---|
| 451 | - md=SetIceShelfBC(md,'Front.exp');
|
|---|
| 452 | -
|
|---|
| 453 | - See also: SETICESHEETBC, SETMARINEICESHEETBC
|
|---|
| 454 | +
|
|---|
| 455 | + Neumann BC are used on the ice front (an ANRGUS contour around the ice front
|
|---|
| 456 | + must be given in input)
|
|---|
| 457 | + Dirichlet BC are used elsewhere for diagnostic
|
|---|
| 458 | +
|
|---|
| 459 | + Usage:
|
|---|
| 460 | + md=SetIceShelfBC(md,varargin)
|
|---|
| 461 | +
|
|---|
| 462 | + Example:
|
|---|
| 463 | + md=SetIceShelfBC(md);
|
|---|
| 464 | + md=SetIceShelfBC(md,'Front.exp');
|
|---|
| 465 | +
|
|---|
| 466 | + See also: SETICESHEETBC, SETMARINEICESHEETBC
|
|---|
| 467 | """
|
|---|
| 468 |
|
|---|
| 469 | #node on Dirichlet (boundary and ~icefront)
|
|---|
| 470 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Geometry/FlagElements.py
|
|---|
| 471 | ===================================================================
|
|---|
| 472 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Geometry/FlagElements.py (revision 12943)
|
|---|
| 473 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Geometry/FlagElements.py (revision 12944)
|
|---|
| 474 | @@ -8,17 +8,17 @@
|
|---|
| 475 | """
|
|---|
| 476 | FLAGELEMENTS - flag the elements in an region
|
|---|
| 477 |
|
|---|
| 478 | - The region can be given with an exp file, a list of elements.
|
|---|
| 479 | + The region can be given with an exp file, a list of elements.
|
|---|
| 480 |
|
|---|
| 481 | - Usage:
|
|---|
| 482 | - flag=FlagElements(md,region);
|
|---|
| 483 | + Usage:
|
|---|
| 484 | + flag=FlagElements(md,region);
|
|---|
| 485 |
|
|---|
| 486 | - Example:
|
|---|
| 487 | - flag=FlagElements(md,'all');
|
|---|
| 488 | - flag=FlagElements(md,'');
|
|---|
| 489 | - flag=FlagElements(md,'Domain.exp');
|
|---|
| 490 | - flag=FlagElements(md,'~Domain.exp');
|
|---|
| 491 | - flag=FlagElements(md,md.mask.elementongroundedice);
|
|---|
| 492 | + Example:
|
|---|
| 493 | + flag=FlagElements(md,'all');
|
|---|
| 494 | + flag=FlagElements(md,'');
|
|---|
| 495 | + flag=FlagElements(md,'Domain.exp');
|
|---|
| 496 | + flag=FlagElements(md,'~Domain.exp');
|
|---|
| 497 | + flag=FlagElements(md,md.mask.elementongroundedice);
|
|---|
| 498 | """
|
|---|
| 499 |
|
|---|
| 500 | if isinstance(region,str):
|
|---|
| 501 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py
|
|---|
| 502 | ===================================================================
|
|---|
| 503 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py (revision 12943)
|
|---|
| 504 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py (revision 12944)
|
|---|
| 505 | @@ -6,8 +6,8 @@
|
|---|
| 506 | """
|
|---|
| 507 | ISSMDIR - Get ISSM_DIR environment variable
|
|---|
| 508 |
|
|---|
| 509 | - Usage:
|
|---|
| 510 | - ISSM_DIR=issmdir()
|
|---|
| 511 | + Usage:
|
|---|
| 512 | + ISSM_DIR=issmdir()
|
|---|
| 513 | """
|
|---|
| 514 |
|
|---|
| 515 | if not 'Windows' in platform.system():
|
|---|
| 516 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py
|
|---|
| 517 | ===================================================================
|
|---|
| 518 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py (revision 12943)
|
|---|
| 519 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py (revision 12944)
|
|---|
| 520 | @@ -13,9 +13,9 @@
|
|---|
| 521 | """
|
|---|
| 522 | GENERIC cluster class definition
|
|---|
| 523 |
|
|---|
| 524 | - Usage:
|
|---|
| 525 | - cluster=generic('name','astrid','np',3);
|
|---|
| 526 | - cluster=generic('name',oshostname(),'np',3,'login','username');
|
|---|
| 527 | + Usage:
|
|---|
| 528 | + cluster=generic('name','astrid','np',3);
|
|---|
| 529 | + cluster=generic('name',oshostname(),'np',3,'login','username');
|
|---|
| 530 | """
|
|---|
| 531 |
|
|---|
| 532 | def __init__(self,*args): # {{{
|
|---|
| 533 | Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.py
|
|---|
| 534 | ===================================================================
|
|---|
| 535 | --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.py (revision 12943)
|
|---|
| 536 | +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.py (revision 12944)
|
|---|
| 537 | @@ -4,9 +4,9 @@
|
|---|
| 538 | """
|
|---|
| 539 | PAIROPTIONS class definition
|
|---|
| 540 |
|
|---|
| 541 | - Usage:
|
|---|
| 542 | - pairoptions=pairoptions();
|
|---|
| 543 | - pairoptions=pairoptions('module',true,'solver',false);
|
|---|
| 544 | + Usage:
|
|---|
| 545 | + pairoptions=pairoptions();
|
|---|
| 546 | + pairoptions=pairoptions('module',true,'solver',false);
|
|---|
| 547 | """
|
|---|
| 548 |
|
|---|
| 549 | def __init__(self,*arg):
|
|---|