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

Timestamp:

02/04/15 09:13:18 (10 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed all seaice components of issm

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (3 diffs)

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

@@ -68 +68 @@
         parameters->AddObject(iomodel->CopyConstantObject(InversionTypeEnum));
         parameters->AddObject(iomodel->CopyConstantObject(CalvingLawEnum));
-        if(solution_type==SeaiceSolutionEnum){
-        }
-        else{
+        {/*This is specific to ice...*/
                 parameters->AddObject(iomodel->CopyConstantObject(MeshElementtypeEnum));
                 parameters->AddObject(iomodel->CopyConstantObject(SteadystateReltolEnum));
@@ -160 +158 @@
                         /*Nothing to add to parameters*/
                         break;
-                case SeaiceatmEnum:
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsRhoAirEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsAirCoefEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsAirLinDragCoefEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsAirQuadDragCoefEnum));
-                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");
@@ -181 +173 @@
                         parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsDeepwaterElevationEnum));
                         parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsUpperwaterElevationEnum));
-                        break;
-                case SeaiceoceanEnum:
-                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsRhoOceanEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsOceanCoefEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsOceanLinDragCoefEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsOceanQuadDragCoefEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsOceanTurningAngleEnum));
                         break;
                 default: