Changeset 20452
- Timestamp:
- 04/07/16 11:42:19 (9 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 1 added
- 1 deleted
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
r20307 r20452 48 48 iomodel->FetchDataToInput(elements,VyEnum); 49 49 50 /*Get calvingparameters*/51 bool is calving;50 /*Get moving front parameters*/ 51 bool ismovingfront; 52 52 int calvinglaw; 53 iomodel->Constant(&is calving,TransientIscalvingEnum);54 if(is calving){53 iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); 54 if(ismovingfront){ 55 55 iomodel->Constant(&calvinglaw,CalvingLawEnum); 56 iomodel->Constant(&is calving,TransientIscalvingEnum);56 iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); 57 57 switch(calvinglaw){ 58 58 case DefaultCalvingEnum: … … 129 129 /*Intermediaries */ 130 130 int stabilization,dim, domaintype, calvinglaw; 131 bool is calving;131 bool ismovingfront; 132 132 int i, row, col; 133 133 IssmDouble kappa; … … 138 138 IssmDouble* xyz_list = NULL; 139 139 140 /*Get problem dimension and whether there is calvingor not*/141 basalelement->FindParam(&is calving,TransientIscalvingEnum);140 /*Get problem dimension and whether there is moving front or not*/ 141 basalelement->FindParam(&ismovingfront,TransientIsmovingfrontEnum); 142 142 basalelement->FindParam(&domaintype,DomainTypeEnum); 143 143 basalelement->FindParam(&calvinglaw,CalvingLawEnum); … … 194 194 195 195 /*Load calving inputs*/ 196 if(is calving){196 if(ismovingfront){ 197 197 switch(calvinglaw){ 198 198 case DefaultCalvingEnum: … … 267 267 268 268 /*Get calving speed*/ 269 if(is calving){269 if(ismovingfront){ 270 270 switch(calvinglaw){ 271 271 case DefaultCalvingEnum: -
issm/trunk-jpl/src/c/cores/levelset_core.cpp
r20117 r20452 13 13 14 14 /* intermediaries */ 15 bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,is calving;15 bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront; 16 16 int domaintype, num_extrapol_vars, index; 17 17 int* extrapol_vars=NULL; … … 25 25 femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum); 26 26 femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); 27 femmodel->parameters->FindParam(&is calving,TransientIscalvingEnum);27 femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); 28 28 if(isthermal && domaintype==Domain3DEnum) femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); 29 29 … … 31 31 32 32 /* start the work from here */ 33 if(is calving) Calvingx(femmodel);33 if(ismovingfront) Calvingx(femmodel); 34 34 if(VerboseSolution()) _printf0_(" computing levelset transport\n"); 35 35 /* smoothen slope of lsf for computation of normal on ice domain*/ -
issm/trunk-jpl/src/c/cores/transient_core.cpp
r20136 r20452 21 21 /*parameters: */ 22 22 IssmDouble starttime,finaltime,dt,yts; 23 bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,islevelset,isdamageevolution,ishydrology,is calving;23 bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,islevelset,isdamageevolution,ishydrology,ismovingfront; 24 24 bool save_results,dakota_analysis; 25 25 bool time_adapt; … … 58 58 femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); 59 59 femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); 60 femmodel->parameters->FindParam(&is calving,TransientIscalvingEnum);60 femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); 61 61 if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); 62 62 femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r20125 r20452 83 83 parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); 84 84 parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); 85 parameters->AddObject(iomodel->CopyConstantObject(TransientIs calvingEnum));85 parameters->AddObject(iomodel->CopyConstantObject(TransientIsmovingfrontEnum)); 86 86 parameters->AddObject(iomodel->CopyConstantObject(TransientIsslrEnum)); 87 87 parameters->AddObject(iomodel->CopyConstantObject(TransientIscouplerEnum)); -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r20342 r20452 376 376 TransientIsdamageevolutionEnum, 377 377 TransientIshydrologyEnum, 378 TransientIs calvingEnum,378 TransientIsmovingfrontEnum, 379 379 TransientIsslrEnum, 380 380 TransientNumRequestedOutputsEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r20342 r20452 380 380 case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; 381 381 case TransientIshydrologyEnum : return "TransientIshydrology"; 382 case TransientIs calvingEnum : return "TransientIscalving";382 case TransientIsmovingfrontEnum : return "TransientIsmovingfront"; 383 383 case TransientIsslrEnum : return "TransientIsslr"; 384 384 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r20342 r20452 389 389 else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; 390 390 else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum; 391 else if (strcmp(name,"TransientIs calving")==0) return TransientIscalvingEnum;391 else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum; 392 392 else if (strcmp(name,"TransientIsslr")==0) return TransientIsslrEnum; 393 393 else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; -
issm/trunk-jpl/src/m/classes/calving.js
r19903 r20452 26 26 this.checkconsistency = function(md,solution,analyses) { // {{{ 27 27 //Early return 28 if (solution!=TransientSolutionEnum() | md.trans.is calving==0) return;28 if (solution!=TransientSolutionEnum() | md.trans.ismovingfront==0) return; 29 29 30 30 checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); -
issm/trunk-jpl/src/m/classes/calving.m
r19903 r20452 43 43 function md = checkconsistency(self,md,solution,analyses) % {{{ 44 44 %Early return 45 if (solution~=TransientSolutionEnum() | md.transient.is calving==0), return; end45 if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end 46 46 47 47 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); -
issm/trunk-jpl/src/m/classes/calving.py
r19903 r20452 50 50 51 51 #Early return 52 if (solution!=TransientSolutionEnum()) or (not md.transient.is calving):52 if (solution!=TransientSolutionEnum()) or (not md.transient.ismovingfront): 53 53 return md 54 54 -
issm/trunk-jpl/src/m/classes/calvingdev.m
r19903 r20452 45 45 function md = checkconsistency(self,md,solution,analyses) % {{{ 46 46 %Early return 47 if (solution~=TransientSolutionEnum() | md.transient.is calving==0), return; end47 if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end 48 48 49 49 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); -
issm/trunk-jpl/src/m/classes/calvinglevermann.m
r19903 r20452 45 45 function md = checkconsistency(self,md,solution,analyses) % {{{ 46 46 %Early return 47 if (solution~=TransientSolutionEnum() | md.transient.is calving==0), return; end47 if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end 48 48 49 49 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); -
issm/trunk-jpl/src/m/classes/calvinglevermann.py
r19903 r20452 50 50 51 51 #Early return 52 if (solution!=TransientSolutionEnum()) or (not md.transient.is calving):52 if (solution!=TransientSolutionEnum()) or (not md.transient.ismovingfront): 53 53 return md 54 54 -
issm/trunk-jpl/src/m/classes/calvingpi.m
r19903 r20452 45 45 function md = checkconsistency(self,md,solution,analyses) % {{{ 46 46 %Early return 47 if (solution~=TransientSolutionEnum() | md.transient.is calving==0), return; end47 if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end 48 48 49 49 md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); -
issm/trunk-jpl/src/m/classes/trans.js
r20257 r20452 17 17 this.isdamageevolution = 0; 18 18 this.islevelset = 0; 19 this.is calving= 0;19 this.ismovingfront = 0; 20 20 this.ishydrology = 0; 21 21 this.isslr = 0; … … 38 38 fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient'); 39 39 fielddisplay(this,'islevelset','LEVEL SET DESCRIPTION...'); 40 fielddisplay(this,'is calving','indicates whether calvingis used in the transient');40 fielddisplay(this,'ismovingfront','indicates whether a moving front capability is used in the transient'); 41 41 fielddisplay(this,'ishydrology','indicates whether an hydrology model is used'); 42 42 fielddisplay(this,'isslr','indicates whether a sea-level rise model is used'); … … 62 62 checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); 63 63 checkfield(md,'fieldname','trans.islevelset','numel',[1],'values',[0, 1]); 64 checkfield(md,'fieldname','trans.is calving','numel',[1],'values',[0, 1]);64 checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]); 65 65 checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]); 66 66 checkfield(md,'fieldname','trans.iscoupler','numel',[1],'values',[0 ,1]); … … 78 78 WriteData(fid,'object',this,'fieldname','ishydrology','format','Boolean'); 79 79 WriteData(fid,'object',this,'fieldname','islevelset','format','Boolean'); 80 WriteData(fid,'object',this,'fieldname','is calving','format','Boolean');80 WriteData(fid,'object',this,'fieldname','ismovingfront','format','Boolean'); 81 81 WriteData(fid,'object',this,'fieldname','isslr','format','Boolean'); 82 82 WriteData(fid,'object',this,'fieldname','iscoupler','format','Boolean'); … … 110 110 this.isdamageevolution = 0; 111 111 this.islevelset = 0; 112 this.is calving= 0;112 this.ismovingfront = 0; 113 113 this.ishydrology = 0; 114 114 this.isslr = 0; -
issm/trunk-jpl/src/m/classes/transient.m
r20256 r20452 14 14 isdamageevolution = 0; 15 15 islevelset = 0; 16 is calving= 0;16 ismovingfront = 0; 17 17 ishydrology = 0; 18 18 isslr = 0; 19 iscoupler 19 iscoupler = 0; 20 20 requested_outputs = {}; 21 21 end … … 40 40 self.isdamageevolution = 0; 41 41 self.islevelset = 0; 42 self.is calving=0;42 self.ismovingfront =0; 43 43 self.ishydrology = 0; 44 44 self.isslr = 0; 45 self.iscoupler 45 self.iscoupler = 0; 46 46 47 47 %default output … … 59 59 self.isdamageevolution = 0; 60 60 self.islevelset = 0; 61 self.is calving= 0;61 self.ismovingfront = 0; 62 62 self.ishydrology = 0; 63 63 self.isslr = 0; 64 self.iscoupler 64 self.iscoupler = 0; 65 65 66 66 %default output … … 87 87 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); 88 88 md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]); 89 md = checkfield(md,'fieldname','transient.is calving','numel',[1],'values',[0 1]);89 md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0 1]); 90 90 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]); 91 91 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1); … … 105 105 fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'); 106 106 fielddisplay(self,'islevelset','LEVEL SET DESCRIPTION...'); 107 fielddisplay(self,'is calving','indicates whether calvingis used in the transient');107 fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient'); 108 108 fielddisplay(self,'ishydrology','indicates whether an hydrology model is used'); 109 109 fielddisplay(self,'isslr','indicates whether a sea-level rise solution is used in the transient'); … … 122 122 WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean'); 123 123 WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean'); 124 WriteData(fid,'object',self,'fieldname','is calving','format','Boolean');124 WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean'); 125 125 WriteData(fid,'object',self,'fieldname','isslr','format','Boolean'); 126 126 WriteData(fid,'object',self,'fieldname','iscoupler','format','Boolean'); … … 145 145 writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); 146 146 writejsdouble(fid,[modelname '.trans.islevelset'],self.islevelset); 147 writejsdouble(fid,[modelname '.trans.is calving'],self.iscalving);147 writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront); 148 148 writejsdouble(fid,[modelname '.trans.ishydrology'],self.ishydrology); 149 149 writejsdouble(fid,[modelname '.trans.isslr'],self.isslr); -
issm/trunk-jpl/src/m/classes/transient.py
r20139 r20452 21 21 self.isdamageevolution = False 22 22 self.islevelset = False 23 self.is calving= False23 self.ismovingfront = False 24 24 self.ishydrology = False 25 25 self.isslr = False … … 41 41 string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) 42 42 string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION')) 43 string="%s\n%s"%(string,fielddisplay(self,'is calving','indicates whether calvingis used in the transient'))43 string="%s\n%s"%(string,fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient')) 44 44 string="%s\n%s"%(string,fielddisplay(self,'ishydrology','indicates whether an hydrology model is used')) 45 45 string="%s\n%s"%(string,fielddisplay(self,'isslr','indicates if a sea level rise solution is used in the transient')) … … 67 67 self.isdamageevolution = False 68 68 self.islevelset = False 69 self.is calving= False69 self.ismovingfront = False 70 70 self.ishydrology = False 71 71 self.isslr = False … … 87 87 self.isdamageevolution = False 88 88 self.islevelset = False 89 self.is calving= False89 self.ismovingfront = False 90 90 self.ishydrology = False 91 91 self.isslr = False … … 111 111 md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1]) 112 112 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1]) 113 md = checkfield(md,'fieldname','transient.is calving','numel',[1],'values',[0,1]);113 md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0,1]); 114 114 md = checkfield(md,'fieldname','transient.isslr','numel',[1],'values',[0,1]) 115 115 md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0,1]) … … 128 128 WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean') 129 129 WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean') 130 WriteData(fid,'object',self,'fieldname','is calving','format','Boolean')130 WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean') 131 131 WriteData(fid,'object',self,'fieldname','isslr','format','Boolean') 132 132 WriteData(fid,'object',self,'fieldname','iscoupler','format','Boolean') -
issm/trunk-jpl/src/m/enum/EnumDefinitions.js
r20342 r20452 365 365 function TransientIsdamageevolutionEnum(){ return 361;} 366 366 function TransientIshydrologyEnum(){ return 362;} 367 function TransientIs calvingEnum(){ return 363;}367 function TransientIsmovingfrontEnum(){ return 363;} 368 368 function TransientIsslrEnum(){ return 364;} 369 369 function TransientNumRequestedOutputsEnum(){ return 365;} -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r20342 r20452 372 372 def TransientIsdamageevolutionEnum(): return StringToEnum("TransientIsdamageevolution")[0] 373 373 def TransientIshydrologyEnum(): return StringToEnum("TransientIshydrology")[0] 374 def TransientIs calvingEnum(): return StringToEnum("TransientIscalving")[0]374 def TransientIsmovingfrontEnum(): return StringToEnum("TransientIsmovingfront")[0] 375 375 def TransientIsslrEnum(): return StringToEnum("TransientIsslr")[0] 376 376 def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0] -
issm/trunk-jpl/test/NightlyRun/test801.m
r19527 r20452 9 9 md.transient.isstressbalance=1; 10 10 md.transient.islevelset=1; 11 md.transient.is calving=1;11 md.transient.ismovingfront=1; 12 12 md.transient.ismasstransport=1; 13 13 md.transient.issmb=1; -
issm/trunk-jpl/test/NightlyRun/test801.py
r19527 r20452 19 19 md.transient.isstressbalance=True 20 20 md.transient.islevelset=True 21 md.transient.is calving=True21 md.transient.ismovingfront=True 22 22 md.transient.ismasstransport=True 23 23 md.transient.issmb=True -
issm/trunk-jpl/test/NightlyRun/test802.m
r20421 r20452 14 14 md.transient.isstressbalance=1; 15 15 md.transient.islevelset=1; 16 md.transient.is calving=1;16 md.transient.ismovingfront=1; 17 17 md.transient.ismasstransport=1; 18 18 md.transient.issmb=1; -
issm/trunk-jpl/test/NightlyRun/test802.py
r20421 r20452 24 24 md.transient.isstressbalance=True 25 25 md.transient.islevelset=True 26 md.transient.is calving=True26 md.transient.ismovingfront=True 27 27 md.transient.ismasstransport=True 28 28 md.transient.issmb=True -
issm/trunk-jpl/test/NightlyRun/test803.m
r20119 r20452 16 16 md.transient.isstressbalance=1; 17 17 md.transient.islevelset=1; 18 md.transient.is calving=1;18 md.transient.ismovingfront=1; 19 19 md.transient.ismasstransport=1; 20 20 md.transient.issmb=1; -
issm/trunk-jpl/test/NightlyRun/test803.py
r20119 r20452 26 26 md.transient.isstressbalance=True 27 27 md.transient.islevelset=True 28 md.transient.is calving=True28 md.transient.ismovingfront=True 29 29 md.transient.ismasstransport=True 30 30 md.transient.issmb=True -
issm/trunk-jpl/test/NightlyRun/test804.m
r19527 r20452 14 14 md.transient.isgroundingline=1; 15 15 md.transient.isgia=0; 16 md.transient.is calving=1;16 md.transient.ismovingfront=1; 17 17 18 18 md.calving.calvingrate=1000.*ones(md.mesh.numberofvertices,1); -
issm/trunk-jpl/test/NightlyRun/test804.py
r19527 r20452 24 24 md.transient.isgroundingline=True 25 25 md.transient.isgia=False 26 md.transient.is calving=True;26 md.transient.ismovingfront=True; 27 27 28 28 md.calving.calvingrate=1000.*numpy.ones((md.mesh.numberofvertices,1)) -
issm/trunk-jpl/test/NightlyRun/test805.m
r20118 r20452 21 21 md.transient.isgroundingline=1; 22 22 md.transient.isgia=0; 23 md.transient.is calving=1;23 md.transient.ismovingfront=1; 24 24 25 25 md.calving.calvingrate=1000.*ones(md.mesh.numberofvertices,1); -
issm/trunk-jpl/test/NightlyRun/test805.py
r20118 r20452 31 31 md.transient.isgroundingline=True 32 32 md.transient.isgia=False 33 md.transient.is calving=True;33 md.transient.ismovingfront=True; 34 34 35 35 md.calving.calvingrate=1000.*numpy.ones((md.mesh.numberofvertices,1)) -
issm/trunk-jpl/test/NightlyRun/test806.m
r20366 r20452 24 24 md.transient.isgroundingline=0; 25 25 md.transient.isgia=0; 26 md.transient.is calving=1;26 md.transient.ismovingfront=1; 27 27 28 28 md.calving=calvinglevermann(); -
issm/trunk-jpl/test/NightlyRun/test806.py
r20366 r20452 35 35 md.transient.isgroundingline=False 36 36 md.transient.isgia=False 37 md.transient.is calving=True;37 md.transient.ismovingfront=True; 38 38 39 39 md.calving=calvinglevermann() -
issm/trunk-jpl/test/NightlyRun/test807.m
r19527 r20452 24 24 md.transient.isgroundingline=0; 25 25 md.transient.isgia=0; 26 md.transient.is calving=1;26 md.transient.ismovingfront=1; 27 27 28 28 md.calving.calvingrate=zeros(md.mesh.numberofvertices,1); -
issm/trunk-jpl/test/NightlyRun/test807.py
r19527 r20452 35 35 md.transient.isgroundingline=False 36 36 md.transient.isgia=False 37 md.transient.is calving=True;37 md.transient.ismovingfront=True; 38 38 39 39 md.calving.calvingrate=numpy.zeros((md.mesh.numberofvertices,1))
Note:
See TracChangeset
for help on using the changeset viewer.