![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 19200
- Timestamp:
- 03/17/15 09:37:44 (10 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 4 added
- 13 edited
-
src/c/analyses/MasstransportAnalysis.cpp (modified) (2 diffs)
-
src/c/analyses/ThermalAnalysis.cpp (modified) (1 diff)
-
src/c/classes/Materials/Matpar.cpp (modified) (5 diffs)
-
src/c/cores/transient_core.cpp (modified) (1 diff)
-
src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (3 diffs)
-
src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (2 diffs)
-
src/c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
-
src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
-
src/c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
-
src/m/classes/SMBd18opdd.m (added)
-
src/m/classes/SMBpdd.m (modified) (14 diffs)
-
src/m/classes/SMBpdd.py (modified) (5 diffs)
-
src/m/classes/clusters/acenet.m (modified) (2 diffs)
-
src/m/enum/EnumDefinitions.py (modified) (1 diff)
-
src/m/enum/SMBd18opddEnum.m (added)
-
test/Archives/Archive240.nc (added)
-
test/NightlyRun/test240.m (added)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
r19172 r19200 180 180 iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); 181 181 iomodel->Constant(&ismungsm,SurfaceforcingsIsmungsmEnum); 182 iomodel->Constant(&isd18opd,SurfaceforcingsIsd18opdEnum);183 182 iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); 184 183 if(isdelta18o || ismungsm){ … … 188 187 iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsLgmEnum); 189 188 } 190 else if (isd18opd){191 iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum);192 iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum);193 }194 189 else{ 195 190 iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum); 196 191 iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum); 197 192 } 193 break; 194 case SMBd18opddEnum: 195 iomodel->Constant(&ismungsm,SurfaceforcingsIsmungsmEnum); 196 iomodel->Constant(&isd18opd,SurfaceforcingsIsd18opdEnum); 197 iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); 198 if (isd18opd){ 199 iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum); 200 iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum); 201 } 202 198 203 break; 199 204 case SMBgradientsEnum: -
issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp
r19176 r19200 26 26 iomodel->Constant(&smb_model,SurfaceforcingsEnum); 27 27 if(smb_model==SMBpddEnum) isdynamic=true; 28 if(smb_model==SMBd18opddEnum) isdynamic=true; 28 29 } 29 30 else{ -
issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp
r19184 r19200 55 55 iomodel->Constant(&this->rlaps,SurfaceforcingsRlapsEnum); 56 56 iomodel->Constant(&this->rlapslgm,SurfaceforcingsRlapslgmEnum); 57 // iomodel->Constant(&this->dpermil,SurfaceforcingsDpermilEnum); 58 break; 57 break; 58 case SMBd18opddEnum: 59 iomodel->Constant(&this->desfac,SurfaceforcingsDesfacEnum); 60 iomodel->Constant(&this->s0p,SurfaceforcingsS0pEnum); 61 iomodel->Constant(&this->s0t,SurfaceforcingsS0tEnum); 62 iomodel->Constant(&this->rlaps,SurfaceforcingsRlapsEnum); 63 iomodel->Constant(&this->rlapslgm,SurfaceforcingsRlapslgmEnum); 64 iomodel->Constant(&this->dpermil,SurfaceforcingsDpermilEnum); 59 65 case SMBgradientsEnum: 66 break; 60 67 /*Nothing to add*/ 61 68 break; … … 135 142 _printf_(" rlaps: " << rlaps << "\n"); 136 143 _printf_(" rlapslgm: " << rlapslgm << "\n"); 137 //_printf_(" dpermil: " << dpermil << "\n");144 _printf_(" dpermil: " << dpermil << "\n"); 138 145 return; 139 146 } … … 181 188 matpar->rlaps=this->rlaps; 182 189 matpar->rlapslgm=this->rlapslgm; 183 //matpar->dpermil=this->dpermil;190 matpar->dpermil=this->dpermil; 184 191 185 192 matpar->sediment_compressibility=this->sediment_compressibility; … … 277 284 this->rlapslgm=constant; 278 285 break; 279 //case SurfaceforcingsDpermilEnum:280 //this->dpermil=constant;281 //break;286 case SurfaceforcingsDpermilEnum: 287 this->dpermil=constant; 288 break; 282 289 default: 283 290 break; … … 406 413 case SurfaceforcingsRlapsEnum: return this->rlaps; 407 414 case SurfaceforcingsRlapslgmEnum: return this->rlapslgm; 408 //case SurfaceforcingsDpermilEnum: return this->dpermil;415 case SurfaceforcingsDpermilEnum: return this->dpermil; 409 416 case MaterialsLithosphereShearModulusEnum: return this->lithosphere_shear_modulus; 410 417 case MaterialsLithosphereDensityEnum: return this->lithosphere_density; -
issm/trunk-jpl/src/c/cores/transient_core.cpp
r19192 r19200 86 86 if(VerboseSolution()) _printf0_(" computing thermal regime\n"); 87 87 if(smb_model==SMBpddEnum) ResetBoundaryConditions(femmodel,ThermalAnalysisEnum); 88 if(smb_model==SMBd18opddEnum) ResetBoundaryConditions(femmodel,ThermalAnalysisEnum); 88 89 thermal_core(femmodel); 89 90 } -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r19191 r19200 108 108 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsdelta18oEnum)); 109 109 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsmungsmEnum)); 110 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsd18opdEnum));111 110 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsDesfacEnum)); 112 111 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0pEnum)); … … 116 115 iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum); 117 116 iomodel->Constant(&ismungsm,SurfaceforcingsIsmungsmEnum); 118 iomodel->Constant(&isd18opd,SurfaceforcingsIsd18opdEnum);119 117 120 118 if(ismungsm){ … … 147 145 iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum); 148 146 } 147 break; 148 case SMBd18opddEnum: 149 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsmungsmEnum)); 150 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsd18opdEnum)); 151 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsDesfacEnum)); 152 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0pEnum)); 153 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0tEnum)); 154 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsRlapsEnum)); 155 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsRlapslgmEnum)); 156 iomodel->Constant(&ismungsm,SurfaceforcingsIsmungsmEnum); 157 iomodel->Constant(&isd18opd,SurfaceforcingsIsd18opdEnum); 149 158 if(isd18opd){ 150 159 iomodel->Constant(&yts,ConstantsYtsEnum); -
issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp
r19172 r19200 24 24 femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum); 25 25 femmodel->parameters->FindParam(&ismungsm,SurfaceforcingsIsmungsmEnum); 26 femmodel->parameters->FindParam(&isd18opd,SurfaceforcingsIsd18opdEnum);27 26 if(isdelta18o){ 28 27 if(VerboseSolution()) _printf0_(" call Delta18oParameterization module\n"); … … 33 32 MungsmtpParameterizationx(femmodel); 34 33 } 34 if(VerboseSolution()) _printf0_(" call positive degree day module\n"); 35 PositiveDegreeDayx(femmodel); 36 break; 37 case SMBd18opddEnum: 38 femmodel->parameters->FindParam(&isd18opd,SurfaceforcingsIsd18opdEnum); 35 39 if(isd18opd){ 36 40 if(VerboseSolution()) _printf0_(" call Delta18opdParameterization module\n"); 37 41 Delta18opdParameterizationx(femmodel); 38 }39 42 if(VerboseSolution()) _printf0_(" call positive degree day module\n"); 40 43 PositiveDegreeDayx(femmodel); 44 } 41 45 break; 42 46 case SMBgradientsEnum: -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r19198 r19200 347 347 SMBEnum, 348 348 SurfaceforcingsMassBalanceEnum, 349 SMBpddEnum, 349 SMBpddEnum, 350 350 SurfaceforcingsDelta18oEnum, 351 351 SurfaceforcingsDelta18oSurfaceEnum, … … 366 366 SurfaceforcingsTdiffEnum, 367 367 SurfaceforcingsSealevEnum, 368 SMBd18opddEnum, 368 369 SurfaceforcingsDpermilEnum, 369 370 SMBgradientsEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r19198 r19200 370 370 case SurfaceforcingsTdiffEnum : return "SurfaceforcingsTdiff"; 371 371 case SurfaceforcingsSealevEnum : return "SurfaceforcingsSealev"; 372 case SMBd18opddEnum : return "SMBd18opdd"; 372 373 case SurfaceforcingsDpermilEnum : return "SurfaceforcingsDpermil"; 373 374 case SMBgradientsEnum : return "SMBgradients"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r19198 r19200 376 376 else if (strcmp(name,"SurfaceforcingsTdiff")==0) return SurfaceforcingsTdiffEnum; 377 377 else if (strcmp(name,"SurfaceforcingsSealev")==0) return SurfaceforcingsSealevEnum; 378 else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum; 378 379 else if (strcmp(name,"SurfaceforcingsDpermil")==0) return SurfaceforcingsDpermilEnum; 379 380 else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum; … … 382 383 else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; 383 384 else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; 384 else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; 388 if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; 389 else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; 389 390 else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; 390 391 else if (strcmp(name,"SurfaceforcingsAccumulation")==0) return SurfaceforcingsAccumulationEnum; … … 505 506 else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; 506 507 else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; 507 else if (strcmp(name,"Param")==0) return ParamEnum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"Pengrid")==0) return PengridEnum; 511 if (strcmp(name,"Param")==0) return ParamEnum; 512 else if (strcmp(name,"Pengrid")==0) return PengridEnum; 512 513 else if (strcmp(name,"Penpair")==0) return PenpairEnum; 513 514 else if (strcmp(name,"Profiler")==0) return ProfilerEnum; … … 628 629 else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; 629 630 else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; 630 else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;631 631 else stage=6; 632 632 } 633 633 if(stage==6){ 634 if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; 634 if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum; 635 else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; 635 636 else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum; 636 637 else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum; … … 751 752 else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum; 752 753 else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum; 753 else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;754 754 else stage=7; 755 755 } 756 756 if(stage==7){ 757 if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum; 757 if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum; 758 else if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum; 758 759 else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum; 759 760 else if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum; … … 874 875 else if (strcmp(name,"Sset")==0) return SsetEnum; 875 876 else if (strcmp(name,"Verbose")==0) return VerboseEnum; 876 else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;877 877 else stage=8; 878 878 } 879 879 if(stage==8){ 880 if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; 880 if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum; 881 else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; 881 882 else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; 882 883 else if (strcmp(name,"XY")==0) return XYEnum; -
issm/trunk-jpl/src/m/classes/SMBpdd.m
r19172 r19200 13 13 rlaps = 0; 14 14 rlapslgm = 0; 15 dpermil = 0;16 15 Pfac = NaN; 17 16 Tdiff = NaN; … … 19 18 isdelta18o = 0; 20 19 ismungsm = 0; 21 isd18opd = 0;22 20 delta18o = NaN; 23 21 delta18o_surface = NaN; … … 37 35 end % }}} 38 36 function self = extrude(self,md) % {{{ 39 if(self.isdelta18o==0 & self.ismungsm==0 & self.isd18opd==0),self.precipitation=project3d(md,'vector',self.precipitation,'type','node');end40 if(self.isdelta18o==0 & self.ismungsm==0 & self.isd18opd==0),self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node');end37 if(self.isdelta18o==0 & self.ismungsm==0),self.precipitation=project3d(md,'vector',self.precipitation,'type','node');end 38 if(self.isdelta18o==0 & self.ismungsm==0),self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node');end 41 39 if(self.isdelta18o),self.temperatures_lgm=project3d(md,'vector',self.temperatures_lgm,'type','node');end 42 40 if(self.isdelta18o),self.temperatures_presentday=project3d(md,'vector',self.temperatures_presentday,'type','node');end … … 47 45 if(self.ismungsm),self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node');end 48 46 if(self.ismungsm),self.precipitations_lgm=project3d(md,'vector',self.precipitations_lgm,'type','node');end 49 if(self.isd18opd),self.temperatures_presentday=project3d(md,'vector',self.temperatures_presentday,'type','node');end50 if(self.isd18opd),self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node');end51 47 52 48 end % }}} … … 63 59 self.isdelta18o = 0; 64 60 self.ismungsm = 0; 65 self.isd18opd = 0;66 61 self.desfac = 0.5; 67 62 self.s0p = 0; … … 69 64 self.rlaps = 6.5; 70 65 self.rlapslgm = 6.5; 71 self.dpermil = 2.4;72 66 73 67 end % }}} … … 80 74 md = checkfield(md,'fieldname','surfaceforcings.rlaps','>=',0,'numel',1); 81 75 md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1); 82 if(self.isdelta18o==0 & self.ismungsm==0 & self.isd18opd==0)76 if(self.isdelta18o==0 & self.ismungsm==0) 83 77 md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','timeseries',1,'NaN',1); 84 78 md = checkfield(md,'fieldname','surfaceforcings.precipitation','timeseries',1,'NaN',1); … … 100 94 md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1); 101 95 md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1); 102 elseif(self.isd18opd==1)103 md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);104 md = checkfield(md,'fieldname','surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1);105 md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1);106 md = checkfield(md,'fieldname','surfaceforcings.dpermil','>=',0,'numel',1);107 96 end 108 97 end … … 114 103 fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'); 115 104 fielddisplay(self,'ismungsm','is temperature and precipitation mungsm parametrisation activated (0 or 1, default is 0)'); 116 fielddisplay(self,'isd18opd','is delta18o parametrisation from present day temperature and precipitation activated (0 or 1, default is 0)');117 105 fielddisplay(self,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]'); 118 106 fielddisplay(self,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'); … … 120 108 fielddisplay(self,'rlaps','present day lapse rate [degree/km]'); 121 109 fielddisplay(self,'rlapslgm','LGM lapse rate [degree/km]'); 122 if(self.isdelta18o==0 & self.ismungsm==0 & self.isd18opd==0)110 if(self.isdelta18o==0 & self.ismungsm==0) 123 111 fielddisplay(self,'monthlytemperatures',['monthly surface temperatures [K], required if pdd is activated and delta18o not activated']); 124 112 fielddisplay(self,'precipitation',['monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o or mungsm not activated']); … … 128 116 fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); 129 117 fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); 130 fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm /d18opdis activated');118 fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm is activated'); 131 119 fielddisplay(self,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm is activated'); 132 120 fielddisplay(self,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); 133 121 fielddisplay(self,'sealev','sea level [m], 1D(year), required if mungsm is activated'); 134 122 elseif(self.ismungsm==1) 135 fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm /d18opdis activated');123 fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); 136 124 fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); 137 fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm /d18opdis activated');125 fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm is activated'); 138 126 fielddisplay(self,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm is activated'); 139 127 fielddisplay(self,'Pfac','time interpolation parameter for precipitation, 1D(year), required if mungsm is activated'); 140 128 fielddisplay(self,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); 141 129 fielddisplay(self,'sealev','sea level [m], 1D(year), required if mungsm is activated'); 142 elseif(self.isd18opd==1)143 fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm/d18opd is activated');144 fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o/mungsm/d18opd is activated');145 fielddisplay(self,'delta18o','delta18o, required if pdd is activated and d18opd activated');146 fielddisplay(self,'dpermil','degree per mil, required if d18opd is activated');147 130 end 148 131 end % }}} … … 155 138 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean'); 156 139 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','ismungsm','format','Boolean'); 157 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isd18opd','format','Boolean');158 140 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double'); 159 141 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double'); … … 162 144 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','rlapslgm','format','Double'); 163 145 164 if(self.isdelta18o==0 & self.ismungsm==0 & self.isd18opd==0)146 if(self.isdelta18o==0 & self.ismungsm==0) 165 147 %WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1); 166 148 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); … … 183 165 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1); 184 166 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1); 185 elseif self.isd18opd186 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1);187 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1);188 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1);189 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','dpermil','format','Double');190 167 end 191 168 end % }}} -
issm/trunk-jpl/src/m/classes/SMBpdd.py
r19190 r19200 27 27 self.isdelta18o = 0 28 28 self.ismungsm = 0 29 self.isd18opd = 030 29 self.delta18o = float('NaN') 31 30 self.delta18o_surface = float('NaN') … … 43 42 string="%s\n%s"%(string,fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)')) 44 43 string="%s\n%s"%(string,fielddisplay(self,'ismungsm','is temperature and precipitation mungsm parametrisation activated (0 or 1, default is 0)')) 45 string="%s\n%s"%(string,fielddisplay(self,'isd18opd','is delta18o parametrisation from present day temperature and precipitation activated (0 or 1, default is 0)'))46 44 string="%s\n%s"%(string,fielddisplay(self,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]')) 47 45 string="%s\n%s"%(string,fielddisplay(self,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]')) … … 73 71 def extrude(self,md): # {{{ 74 72 75 if not (self.isdelta18o and self.ismungsm and self.isd18opd):73 if not (self.isdelta18o and self.ismungsm): 76 74 self.precipitation=project3d(md,'vector',self.precipitation,'type','node') 77 75 self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node') … … 116 114 md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',[1]) 117 115 118 if (self.isdelta18o==0 and self.ismungsm==0 and self.isd18opd):116 if (self.isdelta18o==0 and self.ismungsm==0): 119 117 md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','NaN',1) 120 118 md = checkfield(md,'fieldname','surfaceforcings.precipitation','NaN',1) … … 147 145 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean') 148 146 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','ismungsm','format','Boolean') 149 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isd18opd','format','Boolean')150 147 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double') 151 148 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double') -
issm/trunk-jpl/src/m/classes/clusters/acenet.m
r19184 r19200 74 74 % fprintf(fid,'#$ -l h_rt=336:00:0\n'); 75 75 76 fprintf(fid,'#$ -l h_vmem=3G\n'); 77 % if cluster.np>10 78 % fprintf(fid,'#$ -l h_vmem=3G\n'); 79 % else 80 % fprintf(fid,'#$ -l h_vmem=3G\n'); 81 % end 76 fprintf(fid,'#$ -l h_vmem=2G\n'); 82 77 83 78 % ---- Which queue to use ---- 84 % fprintf(fid,'#$ -q !tarasov.q\n'); %79 % fprintf(fid,'#$ -q tarasov.q\n'); % 85 80 %fprintf(fid,'#$ -q medium.q@*,short.q@*\n'); 86 81 fprintf(fid,'#$ -q short.q@*\n'); 87 82 88 83 % ---- Which node are selected ---- 89 % 90 % fprintf(fid,'#$ -l h=cl0* \n');84 %fprintf(fid,'#$ -l h=cl27*|cl28*|cl29*|cl30*|cl31*|cl320|cl267|cl268|cl269|cl338 \n'); 85 % fprintf(fid,'#$ -l h=cl0* \n'); 91 86 %fprintf(fid,'#$ -l h=cl338 \n'); 92 87 % Acenet nodes with 16cpus and more than 60G mem … … 94 89 95 90 % ---- cpus on different nodes ---- 96 91 fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand 97 92 % fprintf(fid,'#$ -pe ompi* %i\n',cluster.np); 98 93 % -------- All cpus in the same node -------- 99 % fprintf(fid,'#$ -pe openmp %i\n',cluster.np);94 % fprintf(fid,'#$ -pe openmp %i\n',cluster.np); 100 95 101 96 % ---- misc ---- -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r19198 r19200 362 362 def SurfaceforcingsTdiffEnum(): return StringToEnum("SurfaceforcingsTdiff")[0] 363 363 def SurfaceforcingsSealevEnum(): return StringToEnum("SurfaceforcingsSealev")[0] 364 def SMBd18opddEnum(): return StringToEnum("SMBd18opdd")[0] 364 365 def SurfaceforcingsDpermilEnum(): return StringToEnum("SurfaceforcingsDpermil")[0] 365 366 def SMBgradientsEnum(): return StringToEnum("SMBgradients")[0]
Note:
See TracChangeset
for help on using the changeset viewer.
