Changeset 12892

Timestamp:

08/03/12 11:45:52 (13 years ago)

Author:

lemorzad

Message:

update for ispdd method

Location:

issm/trunk-jpl/src

Files:

• c/classes/objects/Elements/Penta.cpp (modified) (2 diffs)
• m/utils/BC/SetIceSheetBC.m (modified) (1 diff)
• m/utils/BC/SetIceShelfBC.m (modified) (1 diff)
• m/utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -713 +713 @@
                         input2->GetInputValue(&TemperaturesLgm[iv][month],gauss,month/12.*yts);
                         input3->GetInputValue(&PrecipitationsPresentday[iv][month],gauss,month/12.*yts);
-                        monthlyprec[iv][month]=monthlyprec[iv][month]*yts; // convertion to m/yr
+                        PrecipitationsPresentday[iv][month]=PrecipitationsPresentday[iv][month]/yts; // converion in m/sec
                 }
         }
@@ -1568 +1568 @@
         }
         #endif
-
 }
 /*}}}*/

issm/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m

@@ -34 +34 @@
 
 %Create zeros basal melting rate and surface mass balance if not specified
-if isnan(md.surfaceforcings.precipitation),
+if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance),
+if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
         md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.mass_balance specified: values set as zero');

issm/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m

@@ -65 +65 @@
 
 %Create zeros basalforcings and surfaceforcings
-if isnan(md.surfaceforcings.precipitation),
+if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance),
-        md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
-        disp('      no surfaceforcings.mass_balance specified: values set as zero');
+if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
+                md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
+                disp('      no surfaceforcings.mass_balance specified: values set as zero');
 end
 if isnan(md.basalforcings.melting_rate),

issm/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -76 +76 @@
 
 %Create zeros basalforcings and surfaceforcings
-if isnan(md.surfaceforcings.precipitation),
+if (isnan(md.surfaceforcings.precipitation)& (md.surfaceforcings.ispdd==1) & (md.surfaceforcings.ispdd==0)),
         md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.precipitation specified: values set as zero');
 end
-if isnan(md.surfaceforcings.mass_balance),
+if isnan(md.surfaceforcings.mass_balance) & (md.surfaceforcings.ispdd==0),
         md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
         disp('      no surfaceforcings.mass_balance specified: values set as zero');