Changeset 12296

Timestamp:

05/29/12 09:57:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (2 diffs)
• c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (modified) (1 diff)
• c/modules/modules.h (modified) (1 diff)
• m/classes/surfaceforcings.m (modified) (2 diffs)
• m/utils/BC/SetMarineIceSheetBC.m (modified) (2 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -46 +46 @@
         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
         iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
-        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);
@@ -74 +72 @@
           iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
         }
+        else{
+                iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
+        }
+
         /*Free data: */
         iomodel->DeleteData(1,MeshElementsEnum);

issm/trunk/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp

@@ -20 +20 @@
 //    monthly mean precip rate (m/yr water equivalent): vPrec(NA,NTIME)
 //    OUTPUT: mass-balance (m/yr ice): agd(NA)
-//    mean annual sssurface temperature (degrees C): Tsurf(NA)
+//    mean annual surface temperature (degrees C): Tsurf(NA)
 
   int    i, it, jj, itm;

issm/trunk/src/c/modules/modules.h

@@ -122 +122 @@
 #include "./VerticesDofx/VerticesDofx.h"
 #include "./VecMergex/VecMergex.h"
-
-
 #endif

issm/trunk/src/m/classes/surfaceforcings.m

@@ -8 +8 @@
                 precipitation = NaN;
                 mass_balance  = NaN;
-                ispdd = NaN;
+                ispdd = false;
         end
         methods
@@ -21 +21 @@
                 function obj = setdefaultparameters(obj) % {{{
                   
-                  %pdd methode not use in default mode
-                  obj.ispdd=0;
+                  %pdd method not used in default mode
+                  obj.ispdd=false;
 
                 end % }}}

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

@@ -58 +58 @@
 %segment on Neumann (Ice Front)
 pos=find(vertexonicefront(md.mesh.segments(:,1)) | vertexonicefront(md.mesh.segments(:,2)));
-
 if (md.mesh.dimension==2)
         pressureload=md.mesh.segments(pos,:);
@@ -107 +106 @@
         disp('      no thermal boundary conditions created: no observed temperature found');
 end
-