Changeset 20181

Timestamp:

02/16/16 15:36:20 (9 years ago)

Author:

Eric.Larour

Message:

CHG: new love_numbers routine. new slr.js and model.js hook up as well
as savemodelasjs routine in slr.m.

Location:

issm/trunk-jpl/src/m

Files:

• Makefile.am (modified) (1 diff)
• boundaryconditions/love_numbers.m (modified) (1 diff)
• classes/maskpsl.m (modified) (1 diff)
• classes/mesh3dsurface.m (modified) (1 diff)
• classes/model.js (modified) (3 diffs)
• classes/slr.js (added)
• classes/slr.m (modified) (1 diff)

issm/trunk-jpl/src/m/Makefile.am

@@ -119 +119 @@
                                 ${ISSM_DIR}/src/m/classes/radaroverlay.js \
                                 ${ISSM_DIR}/src/m/classes/rifts.js \
+                                ${ISSM_DIR}/src/m/classes/slr.js \
                                 ${ISSM_DIR}/src/m/classes/settings.js \
                                 ${ISSM_DIR}/src/m/classes/SMBforcing.js \

issm/trunk-jpl/src/m/boundaryconditions/love_numbers.m

@@ -17 +17 @@
 
         love_numbers=[...
-        -0.28740059 -0.00000000 0.10141481 1.28740059 0.42519882 0.89858519 0.00000000;
+     0           0          0          0          0          0          0 
+        -1.28740059     -1.00000000     -0.89858519 1.28740059 0.42519882 0.89858519 0.00000000
         -1.00025365 -0.30922675 0.02060926 1.69102690 0.46358648 0.67016399 0.61829668;
         -1.06243501 -0.19927948 0.06801636 1.86315553 0.55741597 0.73270416 0.56270589;

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

@@ -81 +81 @@
 
                 end % }}}
+                function savemodeljs(self,fid,modelname) % {{{
+                
+                        writejs1Darray(fid,[modelname '.mask.groundedice_levelset'],self.groundedice_levelset);
+                        writejs2Darray(fid,[modelname '.mask.ice_levelset'],self.ice_levelset);
+                        writejs2Darray(fid,[modelname '.mask.ocean_levelset'],self.ocean_levelset);
+                        writejs2Darray(fid,[modelname '.mask.land_levelset'],self.land_levelset);
+
+                end % }}}
         end
 end

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

@@ -166 +166 @@
                         z        = self.z;
                 end % }}}
+                function savemodeljs(self,fid,modelname) % {{{
+                
+                        writejs1Darray(fid,[modelname '.mesh.x'],self.x);
+                        writejs1Darray(fid,[modelname '.mesh.y'],self.y);
+                        writejs1Darray(fid,[modelname '.mesh.z'],self.z);
+                        writejs2Darray(fid,[modelname '.mesh.elements'],self.elements);
+                        writejsdouble(fid,[modelname '.mesh.numberofelements'],self.numberofelements);
+                        writejsdouble(fid,[modelname '.mesh.numberofvertices'],self.numberofvertices);
+                        writejsdouble(fid,[modelname '.mesh.numberofedges'],self.numberofedges);
+                        writejs1Darray(fid,[modelname '.mesh.lat'],self.lat);
+                        writejs1Darray(fid,[modelname '.mesh.long'],self.long);
+                        writejs1Darray(fid,[modelname '.mesh.r'],self.r);
+                        writejs1Darray(fid,[modelname '.mesh.vertexonboundary'],self.vertexonboundary);
+                        writejs2Darray(fid,[modelname '.mesh.edges'],self.edges);
+                        writejs2Darray(fid,[modelname '.mesh.segments'],self.segments);
+                        writejs2Darray(fid,[modelname '.mesh.segmentmarkers'],self.segmentmarkers);
+                        writejs2Darray(fid,[modelname '.mesh.vertexconnectivity'],self.vertexconnectivity);
+                        writejs2Darray(fid,[modelname '.mesh.elementconnectivity'],self.elementconnectivity);
+                        writejsdouble(fid,[modelname '.mesh.average_vertex_connectivity'],self.average_vertex_connectivity);
+                        writejs1Darray(fid,[modelname '.mesh.extractedvertices'],self.extractedvertices);
+                        writejs1Darray(fid,[modelname '.mesh.extractedelements'],self.extractedelements);
+
+                end % }}}
         end
 end

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

@@ -21 +21 @@
                         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"));
+                        console.log(sprintf("%19s: %-22s -- %s","slr"             ,"[1x1 " + typeof(this.slr) + "]","slr forcings"));
                         console.log(sprintf("%19s: %-22s -- %s","debug"           ,"[1x1 " + typeof(this.debug) + "]","debugging tools (valgrind, gprof)"));
                         console.log(sprintf("%19s: %-22s -- %s","verbose"         ,"[1x1 " + typeof(this.verbose) + "]","verbosity level in solve"));
@@ -57 +58 @@
                         this.friction         = new friction();
                         this.rifts            = new rifts();
+                        this.slr              = new slr();
                         this.timestepping     = new timestepping();
                         this.groundingline    = new groundingline();
@@ -124 +126 @@
                 this.initialization   = 0;
                 this.rifts            = 0;
+                this.slr              = 0;
 
                 this.debug            = 0;

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

@@ -120 +120 @@
                 function savemodeljs(self,fid,modelname) % {{{
                 
-                        writejs1Darray(fid,[modelname '.srl.deltathickness'],self.deltathickness);
-                        writejs1Darray(fid,[modelname '.srl.sealevel'],self.sealevel);
+                        writejs1Darray(fid,[modelname '.slr.deltathickness'],self.deltathickness);
+                        writejs1Darray(fid,[modelname '.slr.sealevel'],self.sealevel);
                         writejsdouble(fid,[modelname '.slr.reltol'],self.reltol);
                         writejsdouble(fid,[modelname '.slr.abstol'],self.abstol);
                         writejsdouble(fid,[modelname '.slr.maxiter'],self.maxiter);
-                        writejs1Darray(fid,[modelname '.srl.love_h'],self.love_h);
-                        writejs1Darray(fid,[modelname '.srl.love_k'],self.love_k);
+                        writejs1Darray(fid,[modelname '.slr.love_h'],self.love_h);
+                        writejs1Darray(fid,[modelname '.slr.love_k'],self.love_k);
                         writejsdouble(fid,[modelname '.slr.rigid'],self.rigid);
                         writejsdouble(fid,[modelname '.slr.eustatic'],self.eustatic);