Changeset 17080

Timestamp:

01/09/14 12:00:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleaning up surface forcings, not needed anymore

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (1 diff)
• cores/masstransport_core.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -109 +109 @@
                         iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum);
                         break;
-                case SurfaceforcingsEnum: /*To Be REMOVED*/
-                        iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum);
-                        iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
-                        iomodel->Constant(&issmbgradients,SurfaceforcingsIssmbgradientsEnum);
-                        if(issmbgradients){
-                                iomodel->FetchDataToInput(elements,SurfaceforcingsHrefEnum);
-                                iomodel->FetchDataToInput(elements,SurfaceforcingsSmbrefEnum);
-                                iomodel->FetchDataToInput(elements,SurfaceforcingsBPosEnum);
-                                iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum);
-                        }
-                        if(ispdd){
-                                iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum);
-                                if(isdelta18o){
-                                        iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesLgmEnum);
-                                        iomodel->FetchDataToInput(elements,SurfaceforcingsTemperaturesPresentdayEnum);
-                                        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum);
-                                }
-                                else{
-                                        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
-                                        iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum);
-                                }
-                        }
-                        if(~ispdd && ~issmbgradients){
-                                iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.);
-                        }
-                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -53 +53 @@
                 case SMBgradientsEnum:
                         /*Nothing to add*/
-                        break;
-                case SurfaceforcingsEnum: /*To Be REMOVED*/
-                        iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum);
-                        if(ispdd){
-                                iomodel->Constant(&this->desfac,SurfaceforcingsDesfacEnum);
-                                iomodel->Constant(&this->s0p,SurfaceforcingsS0pEnum);
-                        }
                         break;
                 default:

issm/trunk-jpl/src/c/cores/masstransport_core.cpp

@@ -58 +58 @@
                         SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                         break;
-                case SurfaceforcingsEnum: /*To Be REMOVED*/
-                        femmodel->parameters->FindParam(&issmbgradients,SurfaceforcingsIssmbgradientsEnum);
-                        femmodel->parameters->FindParam(&ispdd,SurfaceforcingsIspddEnum);
-                        femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
-                        if(issmbgradients){
-                                if(VerboseSolution())_printf_(" call smb gradients module\n\n");
-                                SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        }
-                        if(ispdd){
-                                if(isdelta18o){
-                                        if(VerboseSolution()) _printf0_("   call Delta18oParametrization module\n");
-                                        Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                                } 
-                                if(VerboseSolution()) _printf0_("   call positive degree day module\n");
-                                PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        }
-                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");

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

@@ -115 +115 @@
                         /*Nothing to add to parameters*/
                         break;
-                case SurfaceforcingsEnum: /*To Be REMOVED*/
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIspddEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIsdelta18oEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIssmbgradientsEnum));
-                        iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum);
-                        if(ispdd){
-                                parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsDesfacEnum));
-                                parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsS0pEnum));
-                                iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
-                                if(isdelta18o){
-                                        IssmDouble *temp = NULL;
-                                        IssmDouble  yts;
-                                        int         N,M;
-                                        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],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],M));
-                                        iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum);
-                                }
-                        }
-                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");