Changeset 19481

Timestamp:

08/06/15 13:31:32 (10 years ago)

Author:

seroussi

Message:

BUG: fixed mismip melting rate and added NR test

Location:

issm/trunk-jpl

Files:

• src/c/classes/Elements/Element.cpp (modified) (1 diff)
• src/m/classes/mismipbasalforcings.m (modified) (1 diff)
• test/Archives/Archive293.nc (added)
• test/NightlyRun/test293.m (added)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1664 +1664 @@
         this->GetInputListOnVertices(bed,BedEnum);
         for(int i=0;i<numvertices;i++){
-                if(base[i]<upperdepthmelt)  values[i]=0;
-                else values[i]=meltratefactor*(tanh(base[i]-bed[i])/thresholdthickness)*(upperdepthmelt-bed[i]);
+                if(base[i]>upperdepthmelt){
+                        values[i]=0;
+                }
+                else{
+                        values[i]=meltratefactor*tanh((base[i]-bed[i])/thresholdthickness)*(upperdepthmelt-base[i]);
+                }
         }
 

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

@@ -67 +67 @@
                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
                         end
+                        if isnan(md.geometry.bed),
+                                md = checkmessage(md,['requesting mismip basal melting parameterization, but bathymetry is absent!']);
+                        end
                 end % }}}
                 function disp(self) % {{{