Changeset 19824

Timestamp:

11/26/15 10:51:33 (9 years ago)

Author:

Eric.Larour

Message:

CHG: private and transient are keywords in javascript, which means they can't be class names. Replaced them by trans
and priv classes in model.js.

Location:

issm/trunk-jpl

Files:

• src/m/classes/model.js (modified) (6 diffs)
• src/m/classes/priv.js (added)
• src/m/classes/private.js (deleted)
• src/m/classes/trans.js (added)
• src/m/classes/transient.js (deleted)
• src/m/solve/loadresultsfrombuffer.js (modified) (1 diff)
• src/m/solve/marshall.js (modified) (1 diff)
• src/m/solve/solve.js (modified) (6 diffs)
• test/NightlyRun/test101.html (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model.js ¶

@@ -18 +18 @@
                         console.log(sprintf("%19s: %-22s -- %s","friction"        ,"[1x1 " + typeof(this.friction) + "]","basal friction/drag properties"));
                         console.log(sprintf("%19s: %-22s -- %s","flowequation"    ,"[1x1 " + typeof(this.flowequation) + "]","flow equations"));
-                        console.log(sprintf("%19s: %-22s -- %s","timestepping"    ,"[1x1 " + typeof(this.timestepping) + "]","time stepping for transient models"));
+                        console.log(sprintf("%19s: %-22s -- %s","timestepping"    ,"[1x1 " + typeof(this.timestepping) + "]","time stepping for trans models"));
                         console.log(sprintf("%19s: %-22s -- %s","initialization"  ,"[1x1 " + typeof(this.initialization) + "]","initial guess/state"));
                         console.log(sprintf("%19s: %-22s -- %s","rifts"           ,"[1x1 " + typeof(this.rifts) + "]","rifts properties"));
@@ -33 +33 @@
                         console.log(sprintf("%19s: %-22s -- %s","thermal"         ,"[1x1 " + typeof(this.thermal) + "]","parameters for thermal solution"));
                         console.log(sprintf("%19s: %-22s -- %s","steadystate"     ,"[1x1 " + typeof(this.steadystate) + "]","parameters for steadystate solution"));
-                        console.log(sprintf("%19s: %-22s -- %s","transient"       ,"[1x1 " + typeof(this.transient) + "]","parameters for transient solution"));
+                        console.log(sprintf("%19s: %-22s -- %s","trans"       ,"[1x1 " + typeof(this.trans) + "]","parameters for trans solution"));
                         console.log(sprintf("%19s: %-22s -- %s","calving"         ,"[1x1 " + typeof(this.calving) + "]","parameters for calving"));
                         console.log(sprintf("%19s: %-22s -- %s","gia"             ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution"));
@@ -73 +73 @@
                         this.thermal          = new thermal();
                         this.steadystate      = new steadystate();
-                        this.transient        = new transient();
+                        this.trans            = new trans();
                         this.calving          = new calving();
                         this.gia              = new gia();
@@ -84 +84 @@
                         this.outputdefinition = new outputdefinition();
                         this.miscellaneous    = new miscellaneous();
-                        this.private          = new private();
+                        this.priv             = new priv();
                 } //}}}
                 this.checkmessage = function(string){ //{{{
@@ -121 +121 @@
                 this.thermal          = 0;
                 this.steadystate      = 0;
-                this.transient        = 0;
+                this.trans            = 0;
                 this.calving          = 0;
                 this.gia              = 0;
@@ -134 +134 @@
                 this.radaroverlay     = 0;
                 this.miscellaneous    = 0;
-                this.private          = 0;
+                this.priv             = 0;
 
                 //set default values for fields

issm/trunk-jpl/src/m/solve/loadresultsfrombuffer.js ¶

@@ -21 +21 @@
                 
                 //recover solution_type from results
-                md.private.solution=array['SolutionType'];
+                md.priv.solution=array['SolutionType'];
         }
         else throw Error('loadresultsfrombuffer error message: qmu results not supported yet!');

issm/trunk-jpl/src/m/solve/marshall.js ¶

@@ -22 +22 @@
 
                 //Some properties do not need to be marshalled
-                if (field == 'results' | field =='radaroverlay' | field == 'toolkits' | field =='cluster' | field == 'flaim' | field == 'private') continue;
+                if (field == 'results' | field =='radaroverlay' | field == 'toolkits' | field =='cluster' | field == 'flaim' | field == 'priv') continue;
                 
                 //Check that current field is a class

issm/trunk-jpl/src/m/solve/solve.js ¶

@@ -40 +40 @@
 
         //recover some fields
-        md.private.solution=solutionenum;
+        md.priv.solution=solutionenum;
         cluster=md.cluster;
 
@@ -49 +49 @@
                 }
                 if (solutionenum == FlaimSolutionEnum()){
-                        md.private.isconsistent=true;
+                        md.priv.isconsistent=true;
                         md.mesh.checkconsistency(md,solutionenum);
                         md.flaim.checkconsistency(md,solutionenum);
-                        if (md.private.isconsistent==false){
+                        if (md.priv.isconsistent==false){
                                 throw error('solve error message: model not consistent, see messages above');
                         }
@@ -69 +69 @@
         else{
                 if (!(restart == '')){
-                        md.private.runtimename=restart;
+                        md.priv.runtimename=restart;
                 }
                 else if (options.getfieldvalue('runtimename',true)){
                         c=new Date().getTime();
-                        md.private.runtimename=sprintf('%s-%g',md.miscellaneous.name,c);
+                        md.priv.runtimename=sprintf('%s-%g',md.miscellaneous.name,c);
                 }
                 else{
-                        md.private.runtimename=md.miscellaneous.name;
+                        md.priv.runtimename=md.miscellaneous.name;
                 }
         }
@@ -96 +96 @@
                 throw  Error("solve error message: flaim runs not supported yet!");
                 //flaim_sol(md,options);
-                //md.private.solution=EnumToString(solutionenum);
+                //md.priv.solution=EnumToString(solutionenum);
                 //return;
         }
@@ -114 +114 @@
                 throw Error('non local clusters not supported yet!');
 
-                cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota); // queue file
+                cluster.BuildQueueScript(md.priv.runtimename,md.miscellaneous.name,md.priv.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota); // queue file
 
                 //Stop here if batch mode
@@ -140 +140 @@
 
                 if (restart == ''){
-                        cluster.UploadQueueJob(md.miscellaneous.name,md.private.runtimename,filelist);
+                        cluster.UploadQueueJob(md.miscellaneous.name,md.priv.runtimename,filelist);
                 }
 
                 //launch queue job: 
-                cluster.LaunchQueueJob(md.miscellaneous.name,md.private.runtimename,filelist,restart);
+                cluster.LaunchQueueJob(md.miscellaneous.name,md.priv.runtimename,filelist,restart);
 
                 //wait on lock

issm/trunk-jpl/test/NightlyRun/test101.html ¶

@@ -41 +41 @@
 <script type="text/javascript" src="../../src/m/classes/outputdefinition.js"></script>
 <script type="text/javascript" src="../../src/m/classes/miscellaneous.js"></script>
-<script type="text/javascript" src="../../src/m/classes/private.js"></script>
+<script type="text/javascript" src="../../src/m/classes/priv.js"></script>
 <script type="text/javascript" src="../../src/m/classes/steadystate.js"></script>
 <script type="text/javascript" src="../../src/m/classes/rifts.js"></script>
@@ -47 +47 @@
 <script type="text/javascript" src="../../src/m/classes/plotoptions.js"></script>
 <script type="text/javascript" src="../../src/m/classes/pairoptions.js"></script>
-<script type="text/javascript" src="../../src/m/classes/transient.js"></script>
+<script type="text/javascript" src="../../src/m/classes/trans.js"></script>
 <script type="text/javascript" src="../../src/m/boundaryconditions/SetIceShelfBC.js"></script>
 <script type="text/javascript" src="../../src/m/parameterization/setflowequation.js"></script>