Changeset 19268

Timestamp:

04/07/15 16:10:07 (10 years ago)

Author:

schlegel

Message:

CHG: remove the yts pdd conversion in create parameters

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• shared/Elements/ComputeMungsmTemperaturePrecipitation.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -119 +119 @@
                         if(ismungsm){
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsPfacEnum); _assert_(N==2);
-                          for(i=0;i<M;i++) temp[M+i]=temp[M+i];
                           parameters->AddObject(new TransientParam(SurfaceforcingsPfacEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsPfacEnum);
                         
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsTdiffEnum); _assert_(N==2);
-                          for(i=0;i<M;i++) temp[M+i]=temp[M+i];
                           parameters->AddObject(new TransientParam(SurfaceforcingsTdiffEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsTdiffEnum);
 
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsSealevEnum); _assert_(N==2);
-                          for(i=0;i<M;i++) temp[M+i]=temp[M+i];
                           parameters->AddObject(new TransientParam(SurfaceforcingsSealevEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsSealevEnum);
                         }
                         if(isdelta18o){
-                                iomodel->Constant(&yts,ConstantsYtsEnum);
-
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2);
-                                for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
                                 parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum);
 
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oSurfaceEnum); _assert_(N==2);
-                                for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
                                 parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oSurfaceEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum);
@@ -158 +151 @@
                         iomodel->Constant(&isd18opd,SurfaceforcingsIsd18opdEnum);
                         if(isd18opd){
-                                iomodel->Constant(&yts,ConstantsYtsEnum);
-
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2);
-                                for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
                                 parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum);

issm/trunk-jpl/src/c/shared/Elements/ComputeMungsmTemperaturePrecipitation.cpp

@@ -21 +21 @@
     monthlytemperaturestmp[imonth] = tdiffh + TemperaturesPresentday[imonth] ;
 
-    monthlyprectmp[imonth] =min(1.5, PrecipitationsPresentday[imonth] * pow(PrecipitationsLgm[imonth],PfacTime));   // [m/month]
+    monthlyprectmp[imonth] =min(1.5, PrecipitationsPresentday[imonth] * pow(PrecipitationsLgm[imonth],PfacTime));   // [m/yr]
 
     /*Assign output pointer*/