Changeset 14587

Timestamp:

04/15/13 15:21:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Fixing indentation

Location:

issm/trunk-jpl/src/m/classes

Files:

• clusters/greenplanet.m (modified) (1 diff)
• hydrologydc.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/greenplanet.m

@@ -62 +62 @@
                          if isempty(cluster.executionpath), md = checkmessage(md,'executionpath empty'); end
 
+                 end
+                 %}}}
+                 function BuildKrigingQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{
+
+                         if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
+                         if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
+
+                         %compute number of processors
+                         cluster.np=cluster.numnodes*cluster.cpuspernode;
+
+                         %write queuing script 
+                         fid=fopen([modelname '.queue'],'w');
+                         fprintf(fid,'#PBS -S /bin/bash\n');
+                         fprintf(fid,'#PBS -N %s\n',modelname);
+                         fprintf(fid,'#PBS -q %s \n',cluster.queue);
+                         fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes,cluster.cpuspernode);
+                         fprintf(fid,'#PBS -m bea\n');
+                         fprintf(fid,'#PBS -M mmorligh@uci.edu\n');
+                         fprintf(fid,'#PBS -o %s.outlog \n',modelname);
+                         fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
+                         %fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
+                         fprintf(fid,'mpiexec -np %i %s/kriging.exe %s %s\n',cluster.np,cluster.codepath,[cluster.executionpath '/' modelname],modelname);
+                         if ~io_gather, %concatenate the output files:
+                                 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
+                         end
+                         fclose(fid);
                  end
                  %}}}

issm/trunk-jpl/src/m/classes/hydrologydc.m

@@ -5 +5 @@
 
 classdef hydrologydc
-    properties (SetAccess=public) 
-        spcsediment_head          = NaN;
-        sediment_compressibility = 0;
-        sediment_porosity         = 0;
-        sediment_thickness        = 0;
-        sediment_transmitivity    = 0;
-        water_compressibility     = 0;
-        water_density             = 0;
+        properties (SetAccess=public) 
+                 spcsediment_head          = NaN;
+                 sediment_compressibility = 0;
+                 sediment_porosity         = 0;
+                 sediment_thickness        = 0;
+                 sediment_transmitivity    = 0;
+                 water_compressibility     = 0;
+                 water_density             = 0;
     end
     methods
-        function obj = hydrologydc(varargin) % {{{
-            switch nargin
-              case 0
-                obj=setdefaultparameters(obj);
-              otherwise
-                error('constructor not supported');
-            end
-        end % }}}
-        function obj = setdefaultparameters(obj) % {{{
-            
-        %Parameters from de Fleurian 2013
-            obj.sediment_compressibility = 1.0e-08;
-            obj.sediment_porosity         = .4;
-            obj.sediment_thickness        = 20.0;
-            obj.sediment_transmitivity    = 8.0e-04;
-            obj.water_compressibility     = 5.04e-10;
-            obj.water_density             = 1.0e+03;
-            
-        end % }}}
-        function md = checkconsistency(obj,md,solution,analyses) % {{{
-            
-        %Early return
-            if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
-            
-            md = checkfield(md,'hydrology.spcsediment_head','forcing',1);
-            md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1);
-            md = checkfield(md,'hydrology.sediment_porosity','>',0,'numel',1);
-            md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1);
-            md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1);
-            md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1);
-            md = checkfield(md,'hydrology.water_density','>',0,'numel',1);
-        end % }}}
-        function disp(obj) % {{{
-            disp(sprintf('   hydrology Dual Porous Continuum Equivalent parameters:'));
-            
-            fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint, meters above MSL)');
-            fielddisplay(obj,'sediment_compressibility','sediment compressibility (Pa -1)');
-            fielddisplay(obj,'sediment_porosity','sediment(dimensionless)');
-            fielddisplay(obj,'sediment_thickness','sediment thickness (meters)');
-            fielddisplay(obj,'sediment_transmitivity','sediment transmitivity (m2 s-1)');
-            fielddisplay(obj,'water_compressibility','water compressibility (Pa -1)');
-            fielddisplay(obj,'water_density','water density (kg m 3)');
-            
-        end % }}}
-        function marshall(obj,fid) % {{{
-                        WriteData(fid,'enum',HydrologyEnum(),'data',HydrologydcEnum(),'format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double');                   
-                        WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double');                  
-                        WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double');                     
-                        WriteData(fid,'object',obj,'fieldname','water_compressibility','format','Double');                      
-                        WriteData(fid,'object',obj,'fieldname','water_density','format','Double');
-                    end % }}}
+                 function obj = hydrologydc(varargin) % {{{
+                         switch nargin
+                                 case 0
+                                         obj=setdefaultparameters(obj);
+                                 otherwise
+                                         error('constructor not supported');
+                         end
+                 end % }}}
+                 function obj = setdefaultparameters(obj) % {{{
+
+                         %Parameters from de Fleurian 2013
+                         obj.sediment_compressibility = 1.0e-08;
+                         obj.sediment_porosity         = .4;
+                         obj.sediment_thickness        = 20.0;
+                         obj.sediment_transmitivity    = 8.0e-04;
+                         obj.water_compressibility     = 5.04e-10;
+                         obj.water_density             = 1.0e+03;
+
+                 end % }}}
+                 function md = checkconsistency(obj,md,solution,analyses) % {{{
+
+                         %Early return
+                         if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
+
+                         md = checkfield(md,'hydrology.spcsediment_head','forcing',1);
+                         md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1);
+                         md = checkfield(md,'hydrology.sediment_porosity','>',0,'numel',1);
+                         md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1);
+                         md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1);
+                         md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1);
+                         md = checkfield(md,'hydrology.water_density','>',0,'numel',1);
+                 end % }}}
+                 function disp(obj) % {{{
+                         disp(sprintf('   hydrology Dual Porous Continuum Equivalent parameters:'));
+
+                         fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint, meters above MSL)');
+                         fielddisplay(obj,'sediment_compressibility','sediment compressibility (Pa -1)');
+                         fielddisplay(obj,'sediment_porosity','sediment(dimensionless)');
+                         fielddisplay(obj,'sediment_thickness','sediment thickness (meters)');
+                         fielddisplay(obj,'sediment_transmitivity','sediment transmitivity (m2 s-1)');
+                         fielddisplay(obj,'water_compressibility','water compressibility (Pa -1)');
+                         fielddisplay(obj,'water_density','water density (kg m 3)');
+
+                 end % }}}
+                 function marshall(obj,fid) % {{{
+                         WriteData(fid,'enum',HydrologyEnum(),'data',HydrologydcEnum(),'format','Integer');
+                         WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1);
+                         WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double');                  
+                         WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double');                 
+                         WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double');
+                         WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double');                    
+                         WriteData(fid,'object',obj,'fieldname','water_compressibility','format','Double');                     
+                         WriteData(fid,'object',obj,'fieldname','water_density','format','Double');
+                 end % }}}
     end
 end