Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12771) @@ -28,6 +28,8 @@ case 140, name='SquareShelfConstrainedEnthalpyStea'; case 142, name='SquareShelfConstrainedEnthalpyTran'; case 144, name='SquareShelfConstrainedTransP3dEnth'; + case 146, name='SquareShelfConstrainedTranIspddIsdeltaM2d'; + case 148, name='SquareShelfConstrainedTranIspddIsdeltaP3d'; case 202, name='SquareShelfDiagM2d'; case 204, name='SquareShelfDiagM3d'; case 206, name='SquareShelfDiagP3d'; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/prognostic_core.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 12771) @@ -38,8 +38,6 @@ if(VerboseSolution()) _pprintLine_(" call positive degree day module"); PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); } - - if(VerboseSolution()) _pprintLine_(" call computational core"); solver_linear(femmodel); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12771) @@ -149,11 +149,11 @@ SettingsResultsAsPatchesEnum, SettingsWaitonlockEnum, SurfaceforcingsDelta18oEnum, - SurfaceforcingsDelta18oTemperaturesPresentdayEnum, - SurfaceforcingsDelta18oTemperaturesLgmEnum, SurfaceforcingsDelta18oSurfaceEnum, SurfaceforcingsIsdelta18oEnum, SurfaceforcingsPrecipitationsPresentdayEnum, + SurfaceforcingsTemperaturesPresentdayEnum, + SurfaceforcingsTemperaturesLgmEnum, DebugProfilingEnum, ProfilingCurrentMemEnum, ProfilingCurrentFlopsEnum, Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h (revision 12771) @@ -17,7 +17,7 @@ void ComputeDelta18oTemperaturePrecipitation(IssmDouble Delta18oSurfacePresent, IssmDouble Delta18oSurfaceLgm, IssmDouble Delta18oSurfaceTime, 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); int GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp (revision 12771) @@ -8,7 +8,7 @@ void ComputeDelta18oTemperaturePrecipitation(IssmDouble Delta18oSurfacePresent, IssmDouble Delta18oSurfaceLgm, IssmDouble Delta18oSurfaceTime, IssmDouble Delta18oPresent, IssmDouble Delta18oLgm, IssmDouble Delta18oTime, IssmDouble* PrecipitationsPresentday, - IssmDouble* Delta18oTemperaturesLgm, IssmDouble* Delta18oTemperaturesPresentday, + IssmDouble* TemperaturesLgm, IssmDouble* TemperaturesPresentday, IssmDouble* monthlytemperaturesout, IssmDouble* monthlyprecout){ IssmDouble monthlytemperaturestmp[12],monthlyprectmp[12]; @@ -19,12 +19,10 @@ /(Delta18oLgm-Delta18oPresent-delta18oLapseRate*(Delta18oSurfaceLgm-Delta18oSurfacePresent)); 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*/ *(monthlytemperaturesout+imonth) = monthlytemperaturestmp[imonth]; *(monthlyprecout+imonth) = monthlyprectmp[imonth]; } - - } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12771) @@ -158,11 +158,11 @@ else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; 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; else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12771) @@ -154,11 +154,11 @@ case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; 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"; case ProfilingCurrentFlopsEnum : return "ProfilingCurrentFlops"; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 12771) @@ -83,11 +83,8 @@ if(ispdd){ 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); } else{ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12771) @@ -909,9 +909,8 @@ /*}}}*/ /*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; IssmDouble Delta18oSurfacePresent,Delta18oSurfaceLgm,Delta18oSurfaceTime; @@ -921,20 +920,19 @@ this->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum); /*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(); for(int month=0;month<12;month++) { for(int iv=0;ivGaussVertex(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); this->parameters->FindParam(&Delta18oLgm,SurfaceforcingsDelta18oEnum,(finaltime-21000)*yts); @@ -948,10 +946,9 @@ ComputeDelta18oTemperaturePrecipitation(Delta18oSurfacePresent, Delta18oSurfaceLgm, Delta18oSurfaceTime, 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); TransientInput* NewPrecipitationInput = new TransientInput(SurfaceforcingsPrecipitationEnum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12771) @@ -688,7 +688,7 @@ void Penta::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; IssmDouble Delta18oSurfacePresent,Delta18oSurfaceLgm,Delta18oSurfaceTime; @@ -698,15 +698,15 @@ this->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum); /*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(); for(int month=0;month<12;month++) { for(int iv=0;ivGaussVertex(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 } @@ -725,7 +725,7 @@ ComputeDelta18oTemperaturePrecipitation(Delta18oSurfacePresent, Delta18oSurfaceLgm, Delta18oSurfaceTime, Delta18oPresent, Delta18oLgm, Delta18oTime, &PrecipitationsPresentday[iv][0], - &Delta18oTemperaturesLgm[iv][0], &Delta18oTemperaturesPresentday[iv][0], + &TemperaturesLgm[iv][0], &TemperaturesPresentday[iv][0], &monthlytemperatures[iv][0], &monthlyprec[iv][0]); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m (revision 12771) @@ -222,6 +222,9 @@ if ~isnan(md.inversion.min_parameters),md.inversion.min_parameters=project3d(md,'vector',md.inversion.min_parameters,'type','node');end; 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 if ~isnan(md.initialization.pressure), Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesPresentdayEnum.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesPresentdayEnum.m (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesPresentdayEnum.m (revision 12771) @@ -1,11 +0,0 @@ -function macro=SurfaceforcingsDelta18oTemperaturesPresentdayEnum() -%SURFACEFORCINGSDELTA18OTEMPERATURESPRESENTDAYENUM - Enum of SurfaceforcingsDelta18oTemperaturesPresentday -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=SurfaceforcingsDelta18oTemperaturesPresentdayEnum() - -macro=StringToEnum('SurfaceforcingsDelta18oTemperaturesPresentday'); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesLgmEnum.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesLgmEnum.m (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsDelta18oTemperaturesLgmEnum.m (revision 12771) @@ -1,11 +0,0 @@ -function macro=SurfaceforcingsDelta18oTemperaturesLgmEnum() -%SURFACEFORCINGSDELTA18OTEMPERATURESLGMENUM - Enum of SurfaceforcingsDelta18oTemperaturesLgm -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=SurfaceforcingsDelta18oTemperaturesLgmEnum() - -macro=StringToEnum('SurfaceforcingsDelta18oTemperaturesLgm'); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 12771) @@ -1386,26 +1386,6 @@ 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(): """ SURFACEFORCINGSDELTA18OSURFACEENUM - Enum of SurfaceforcingsDelta18oSurface @@ -1436,6 +1416,26 @@ 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(): """ DEBUGPROFILINGENUM - Enum of DebugProfiling Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/surfaceforcings.m =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/surfaceforcings.m (revision 12770) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/surfaceforcings.m (revision 12771) @@ -84,6 +84,7 @@ fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [Kelvin], required if pdd is activated and delta18o activated'); 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)'); fielddisplay(obj,'hc',' elevation of intersection between accumulation and ablation regime required if smb gradients is activated'); @@ -106,6 +107,7 @@ WriteData(fid,'object',obj,'fieldname','temperatures_lgm','format','DoubleMat','mattype',1); 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); WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1);