Changeset 12771

Timestamp:

07/27/12 12:34:56 (13 years ago)

Author:

lemorzad

Message:

some minor modification for delta18o methode

Location:

issm/trunk-jpl

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• src/c/objects/Elements/Penta.cpp (modified) (4 diffs)
• src/c/objects/Elements/Tria.cpp (modified) (4 diffs)
• src/c/shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp (modified) (3 diffs)
• src/c/shared/Elements/elements.h (modified) (1 diff)
• src/c/solutions/prognostic_core.cpp (modified) (1 diff)
• src/m/classes/surfaceforcings.m (modified) (2 diffs)
• src/m/enum/EnumDefinitions.py (modified) (2 diffs)
• src/m/enum/SurfaceforcingsDelta18oTemperaturesLgmEnum.m (deleted)
• src/m/enum/SurfaceforcingsDelta18oTemperaturesPresentdayEnum.m (deleted)
• src/m/model/extrude.m (modified) (1 diff)
• test/NightlyRun/IdToName.m (modified) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -150 +150 @@
         SettingsWaitonlockEnum,
         SurfaceforcingsDelta18oEnum,
-        SurfaceforcingsDelta18oTemperaturesPresentdayEnum,
-        SurfaceforcingsDelta18oTemperaturesLgmEnum,
         SurfaceforcingsDelta18oSurfaceEnum,
         SurfaceforcingsIsdelta18oEnum,
         SurfaceforcingsPrecipitationsPresentdayEnum,
+        SurfaceforcingsTemperaturesPresentdayEnum,
+        SurfaceforcingsTemperaturesLgmEnum,
         DebugProfilingEnum,
         ProfilingCurrentMemEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -155 +155 @@
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
                 case SurfaceforcingsDelta18oEnum : return "SurfaceforcingsDelta18o";
-                case SurfaceforcingsDelta18oTemperaturesPresentdayEnum : return "SurfaceforcingsDelta18oTemperaturesPresentday";
-                case SurfaceforcingsDelta18oTemperaturesLgmEnum : return "SurfaceforcingsDelta18oTemperaturesLgm";
                 case SurfaceforcingsDelta18oSurfaceEnum : return "SurfaceforcingsDelta18oSurface";
                 case SurfaceforcingsIsdelta18oEnum : return "SurfaceforcingsIsdelta18o";
                 case SurfaceforcingsPrecipitationsPresentdayEnum : return "SurfaceforcingsPrecipitationsPresentday";
+                case SurfaceforcingsTemperaturesPresentdayEnum : return "SurfaceforcingsTemperaturesPresentday";
+                case SurfaceforcingsTemperaturesLgmEnum : return "SurfaceforcingsTemperaturesLgm";
                 case DebugProfilingEnum : return "DebugProfiling";
                 case ProfilingCurrentMemEnum : return "ProfilingCurrentMem";

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

@@ -84 +84 @@
                 iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum);
                 if(isdelta18o){
-                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oEnum);
-                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oSurfaceEnum);
-
-                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oTemperaturesLgmEnum);
-                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oTemperaturesPresentdayEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesLgmEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum);
                         iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum);
                 }

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -159 +159 @@
               else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
               else if (strcmp(name,"SurfaceforcingsDelta18o")==0) return SurfaceforcingsDelta18oEnum;
-              else if (strcmp(name,"SurfaceforcingsDelta18oTemperaturesPresentday")==0) return SurfaceforcingsDelta18oTemperaturesPresentdayEnum;
-              else if (strcmp(name,"SurfaceforcingsDelta18oTemperaturesLgm")==0) return SurfaceforcingsDelta18oTemperaturesLgmEnum;
               else if (strcmp(name,"SurfaceforcingsDelta18oSurface")==0) return SurfaceforcingsDelta18oSurfaceEnum;
               else if (strcmp(name,"SurfaceforcingsIsdelta18o")==0) return SurfaceforcingsIsdelta18oEnum;
               else if (strcmp(name,"SurfaceforcingsPrecipitationsPresentday")==0) return SurfaceforcingsPrecipitationsPresentdayEnum;
+              else if (strcmp(name,"SurfaceforcingsTemperaturesPresentday")==0) return SurfaceforcingsTemperaturesPresentdayEnum;
+              else if (strcmp(name,"SurfaceforcingsTemperaturesLgm")==0) return SurfaceforcingsTemperaturesLgmEnum;
               else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;

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

@@ -689 +689 @@
 
         IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12];
-        IssmDouble Delta18oTemperaturesPresentday[NUMVERTICES][12],Delta18oTemperaturesLgm[NUMVERTICES][12];
+        IssmDouble TemperaturesPresentday[NUMVERTICES][12],TemperaturesLgm[NUMVERTICES][12];
         IssmDouble PrecipitationsPresentday[NUMVERTICES][12];
         IssmDouble Delta18oPresent,Delta18oLgm,Delta18oTime;
@@ -699 +699 @@
 
         /*Recover present day temperature and precipitation*/
-        Input*     input=inputs->GetInput(SurfaceforcingsDelta18oTemperaturesPresentdayEnum); _assert_(input);
-        Input*     input2=inputs->GetInput(SurfaceforcingsDelta18oTemperaturesLgmEnum); _assert_(input2);
+        Input*     input=inputs->GetInput(SurfaceforcingsTemperaturesPresentdayEnum); _assert_(input);
+        Input*     input2=inputs->GetInput(SurfaceforcingsTemperaturesLgmEnum); _assert_(input2);
         Input*     input3=inputs->GetInput(SurfaceforcingsPrecipitationsPresentdayEnum); _assert_(input3);
         GaussPenta* gauss=new GaussPenta();
@@ -706 +706 @@
                 for(int iv=0;iv<NUMVERTICES;iv++) {
                         gauss->GaussVertex(iv);
-                        input->GetInputValue(&Delta18oTemperaturesPresentday[iv][month],gauss,month/12.*yts);
-                        input2->GetInputValue(&Delta18oTemperaturesLgm[iv][month],gauss,month/12.*yts);
+                        input->GetInputValue(&TemperaturesPresentday[iv][month],gauss,month/12.*yts);
+                        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
@@ -726 +726 @@
                                         Delta18oPresent, Delta18oLgm, Delta18oTime,
                                         &PrecipitationsPresentday[iv][0], 
-                                        &Delta18oTemperaturesLgm[iv][0], &Delta18oTemperaturesPresentday[iv][0], 
+                                        &TemperaturesLgm[iv][0], &TemperaturesPresentday[iv][0], 
                                         &monthlytemperatures[iv][0], &monthlyprec[iv][0]);
         }

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -910 +910 @@
 /*FUNCTION Tria::Delta18oParameterization{{{*/
 void  Tria::Delta18oParameterization(void){
-
         IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12];
-        IssmDouble Delta18oTemperaturesPresentday[NUMVERTICES][12],Delta18oTemperaturesLgm[NUMVERTICES][12];
+        IssmDouble TemperaturesPresentday[NUMVERTICES][12],TemperaturesLgm[NUMVERTICES][12];
         IssmDouble PrecipitationsPresentday[NUMVERTICES][12];
         IssmDouble Delta18oPresent,Delta18oLgm,Delta18oTime;
@@ -922 +921 @@
 
         /*Recover present day temperature and precipitation*/
-        Input*     input=inputs->GetInput(SurfaceforcingsDelta18oTemperaturesPresentdayEnum); _assert_(input);
-        Input*     input2=inputs->GetInput(SurfaceforcingsDelta18oTemperaturesLgmEnum); _assert_(input2);
+        Input*     input=inputs->GetInput(SurfaceforcingsTemperaturesPresentdayEnum); _assert_(input);
+        Input*     input2=inputs->GetInput(SurfaceforcingsTemperaturesLgmEnum); _assert_(input2);
         Input*     input3=inputs->GetInput(SurfaceforcingsPrecipitationsPresentdayEnum); _assert_(input3);
         GaussTria* gauss=new GaussTria();
@@ -929 +928 @@
                 for(int iv=0;iv<NUMVERTICES;iv++) {
                         gauss->GaussVertex(iv);
-                        input->GetInputValue(&Delta18oTemperaturesPresentday[iv][month],gauss,month/12.*yts);
-                        input2->GetInputValue(&Delta18oTemperaturesLgm[iv][month],gauss,month/12.*yts);
+                        input->GetInputValue(&TemperaturesPresentday[iv][month],gauss,month/12.*yts);
+                        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
                 }
         }
-
         /*Recover delta18o and Delta18oSurface at present day, lgm and at time t*/
         this->parameters->FindParam(&Delta18oPresent,SurfaceforcingsDelta18oEnum,finaltime*yts);
@@ -949 +947 @@
                                         Delta18oPresent, Delta18oLgm, Delta18oTime,
                                         &PrecipitationsPresentday[iv][0], 
-                                        &Delta18oTemperaturesLgm[iv][0], &Delta18oTemperaturesPresentday[iv][0], 
+                                        &TemperaturesLgm[iv][0], &TemperaturesPresentday[iv][0], 
                                         &monthlytemperatures[iv][0], &monthlyprec[iv][0]);
         }
-
         /*Update inputs*/ 
         TransientInput* NewTemperatureInput = new TransientInput(SurfaceforcingsMonthlytemperaturesEnum);

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

@@ -9 +9 @@
                                      IssmDouble Delta18oPresent, IssmDouble Delta18oLgm, IssmDouble Delta18oTime, 
                                      IssmDouble* PrecipitationsPresentday,
-                                     IssmDouble* Delta18oTemperaturesLgm, IssmDouble* Delta18oTemperaturesPresentday, 
+                                     IssmDouble* TemperaturesLgm, IssmDouble* TemperaturesPresentday, 
                                      IssmDouble* monthlytemperaturesout, IssmDouble* monthlyprecout){
 
@@ -20 +20 @@
   
   for (int imonth = 0; imonth<12; imonth++){  
-    monthlytemperaturestmp[imonth] = glacialindex*Delta18oTemperaturesLgm[imonth] + (1-glacialindex)*Delta18oTemperaturesPresentday[imonth];
+    monthlytemperaturestmp[imonth] = glacialindex*TemperaturesLgm[imonth] + (1-glacialindex)*TemperaturesPresentday[imonth];
     monthlyprectmp[imonth] = 1.5*pow(2,((monthlytemperaturestmp[imonth]-0)/10)); //equation from rob's paper
     /*Assign output pointer*/
@@ -26 +26 @@
     *(monthlyprecout+imonth) = monthlyprectmp[imonth];
   }
-
-
 }

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -18 +18 @@
                                      IssmDouble Delta18oPresent, IssmDouble Delta18oLgm, IssmDouble Delta18oTime, 
                                      IssmDouble* PrecipitationsPresentday,
-                                     IssmDouble* Delta18oTemperaturesLgm, IssmDouble* Delta18oTemperaturesPresentday, 
+                                     IssmDouble* TemperaturesLgm, IssmDouble* TemperaturesPresentday, 
                                              IssmDouble* monthlytemperaturesout, IssmDouble* monthlyprecout);
 void   GetVerticesCoordinates(IssmDouble* xyz,  Node** nodes, int numvertices);

issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

@@ -39 +39 @@
                 PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         }
-
-
         if(VerboseSolution()) _pprintLine_("   call computational core");
         solver_linear(femmodel);

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

@@ -85 +85 @@
                         fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [Kelvin], required if pdd is activated and delta18o activated');
                         fielddisplay(obj,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o activated');
+                        fielddisplay(obj,'delta18o','delta18o, required if pdd is activated and delta18o activated');
                         fielddisplay(obj,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated');
                         fielddisplay(obj,'issmbgradients','is smb gradients method activated (0 or 1, default is 0)');
@@ -107 +108 @@
                                 WriteData(fid,'object',obj,'fieldname','precipitations_presentday','format','DoubleMat','mattype',1);
                                 WriteData(fid,'object',obj,'fieldname','delta18o_surface','format','DoubleMat','mattype',1);
+                                WriteData(fid,'object',obj,'fieldname','delta18o','format','DoubleMat','mattype',1);
                           else
                                 WriteData(fid,'object',obj,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1);

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -1387 +1387 @@
         return StringToEnum('SurfaceforcingsDelta18o')
 
-def SurfaceforcingsDelta18oTemperaturesPresentdayEnum():
-        """
-        SURFACEFORCINGSDELTA18OTEMPERATURESPRESENTDAYENUM - Enum of SurfaceforcingsDelta18oTemperaturesPresentday
-
-           Usage:
-              macro=SurfaceforcingsDelta18oTemperaturesPresentdayEnum()
-        """
-
-        return StringToEnum('SurfaceforcingsDelta18oTemperaturesPresentday')
-
-def SurfaceforcingsDelta18oTemperaturesLgmEnum():
-        """
-        SURFACEFORCINGSDELTA18OTEMPERATURESLGMENUM - Enum of SurfaceforcingsDelta18oTemperaturesLgm
-
-           Usage:
-              macro=SurfaceforcingsDelta18oTemperaturesLgmEnum()
-        """
-
-        return StringToEnum('SurfaceforcingsDelta18oTemperaturesLgm')
-
 def SurfaceforcingsDelta18oSurfaceEnum():
         """
@@ -1437 +1417 @@
         return StringToEnum('SurfaceforcingsPrecipitationsPresentday')
 
+def SurfaceforcingsTemperaturesPresentdayEnum():
+        """
+        SURFACEFORCINGSTEMPERATURESPRESENTDAYENUM - Enum of SurfaceforcingsTemperaturesPresentday
+
+           Usage:
+              macro=SurfaceforcingsTemperaturesPresentdayEnum()
+        """
+
+        return StringToEnum('SurfaceforcingsTemperaturesPresentday')
+
+def SurfaceforcingsTemperaturesLgmEnum():
+        """
+        SURFACEFORCINGSTEMPERATURESLGMENUM - Enum of SurfaceforcingsTemperaturesLgm
+
+           Usage:
+              macro=SurfaceforcingsTemperaturesLgmEnum()
+        """
+
+        return StringToEnum('SurfaceforcingsTemperaturesLgm')
+
 def DebugProfilingEnum():
         """

issm/trunk-jpl/src/m/model/extrude.m

@@ -223 +223 @@
 if ~isnan(md.inversion.max_parameters),md.inversion.max_parameters=project3d(md,'vector',md.inversion.max_parameters,'type','node');end;
 if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end
+if(md.surfaceforcings.isdelta18o),md.surfaceforcings.temperatures_lgm=project3d(md,'vector',md.surfaceforcings.temperatures_lgm,'type','node');end
+if(md.surfaceforcings.isdelta18o),md.surfaceforcings.temperatures_presentday=project3d(md,'vector',md.surfaceforcings.temperatures_presentday,'type','node');end
+if(md.surfaceforcings.isdelta18o),md.surfaceforcings.precipitations_presentday=project3d(md,'vector',md.surfaceforcings.precipitations_presentday,'type','node');end
 
 %Put lithostatic pressure if there is an existing pressure

issm/trunk-jpl/test/NightlyRun/IdToName.m

@@ -29 +29 @@
         case 142, name='SquareShelfConstrainedEnthalpyTran';
         case 144, name='SquareShelfConstrainedTransP3dEnth';
+        case 146, name='SquareShelfConstrainedTranIspddIsdeltaM2d';
+        case 148, name='SquareShelfConstrainedTranIspddIsdeltaP3d';
         case 202, name='SquareShelfDiagM2d';
         case 204, name='SquareShelfDiagM3d';