Revert "NEW: adding continuous design QMU capabilities and Mmemasstra…

…nsport"

This reverts commit e99a386.

m4/analyses.m4

@@ -457,20 +457,6 @@ fi
 AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes])
 AC_MSG_RESULT($HAVE_MASSTRANSPORT)
 dnl }}}
-dnl with-Mmemasstransport{{{
-AC_ARG_WITH([Mmemasstransport],
-	AS_HELP_STRING([--with-Mmemasstransport = YES], [compile with Mmemasstransport capabilities (default is yes)]),
-	[MMEMASSTRANSPORT=$withval],[MMEMASSTRANSPORT=yes])
-AC_MSG_CHECKING(for Mmemasstransport capability compilation)
-
-HAVE_MMEMASSTRANSPORT=no 
-if test "x$MMEMASSTRANSPORT" = "xyes"; then
-	HAVE_MMEMASSTRANSPORT=yes
-	AC_DEFINE([_HAVE_MMEMASSTRANSPORT_],[1],[with Mmemasstransport capability])
-fi
-AM_CONDITIONAL([MMEMASSTRANSPORT], [test x$HAVE_MMEMASSTRANSPORT = xyes])
-AC_MSG_RESULT($HAVE_MMEMASSTRANSPORT)
-dnl }}}
 dnl with-Melting{{{
 AC_ARG_WITH([Melting],
 	AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]),

src/c/Makefile.am

@@ -197,7 +197,6 @@ issm_sources += \
 	./toolkits/mpi/commops/GetOwnershipBoundariesFromRange.cpp \
 	./toolkits/ToolkitOptions.cpp \
 	./modules/MmeToInputFromIdx/MmeToInputFromIdx.cpp\
-	./modules/MmeToInputx/MmeToInputx.cpp\
 	./modules/ModelProcessorx/ModelProcessorx.cpp \
 	./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp \
 	./modules/ModelProcessorx/NodesPartitioning.cpp \
@@ -249,7 +248,6 @@ issm_sources += \
 	./modules/Solverx/Solverx.cpp \
 	./modules/StochasticForcingx/StochasticForcingx.cpp \
 	./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp \
-	./modules/UpdateMmesx/UpdateMmesx.cpp \
 	./cores/ProcessArguments.cpp \
 	./cores/ResetBoundaryConditions.cpp \
 	./cores/WrapperCorePointerFromSolutionEnum.cpp \
@@ -276,7 +274,6 @@ issm_sources += \
 	./cores/transient_core.cpp \
 	./cores/steadystate_core.cpp \
 	./cores/masstransport_core.cpp \
-	./cores/mmemasstransport_core.cpp \
 	./cores/oceantransport_core.cpp \
 	./cores/depthaverage_core.cpp \
 	./cores/extrudefrombase_core.cpp \
@@ -500,8 +497,7 @@ if MELTING
 issm_sources += ./analyses/MeltingAnalysis.cpp
 endif
 if MASSTRANSPORT
-issm_sources += ./analyses/MasstransportAnalysis.cpp \
-				./analyses/MmemasstransportAnalysis.cpp
+issm_sources += ./analyses/MasstransportAnalysis.cpp
 endif
 if OCEANTRANSPORT
 issm_sources += ./analyses/OceantransportAnalysis.cpp

src/c/analyses/EnumToAnalysis.cpp

@@ -109,9 +109,6 @@ Analysis* EnumToAnalysis(int analysis_enum){
 		#ifdef _HAVE_MASSTRANSPORT_
 		case MasstransportAnalysisEnum : return new MasstransportAnalysis();
 		#endif
-		#ifdef _HAVE_MMEMASSTRANSPORT_
-		case MmemasstransportAnalysisEnum : return new MmemasstransportAnalysis();
-		#endif
 		#ifdef _HAVE_MELTING_
 		case MeltingAnalysisEnum : return new MeltingAnalysis();
 		#endif

src/c/analyses/OceantransportAnalysis.cpp

@@ -49,9 +49,9 @@ void OceantransportAnalysis::UpdateElements(Elements* elements,Inputs* inputs,Io
 		iomodel->FetchData(&modelid,"md.dsl.modelid");
 
 		/*replace dataset of forcings with only one, the modelid'th:*/
-		MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcbottompressureEnum, P1Enum);
-		MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcdslEnum, P1Enum);
-		MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcstrEnum, P0Enum);
+		MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcbottompressureEnum, P1Enum);
+		MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcdslEnum, P1Enum);
+		MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcstrEnum, P0Enum);
 	}
 
 	/*Initialize sea level cumulated sea level loads :*/

src/c/analyses/SealevelchangeAnalysis.cpp

@@ -79,7 +79,7 @@ void SealevelchangeAnalysis::UpdateElements(Elements* elements,Inputs* inputs,Io
 	iomodel->ConstantToInput(inputs,elements,0.,BedNorthEnum,P1Enum);
     iomodel->FetchDataToInput(inputs,elements,"md.initialization.sealevel",SealevelEnum);
 
-	/*Initialize loads: no! this should be done by the corresponding mass transports!*/
+	/*Initialize loads:*/
 	iomodel->ConstantToInput(inputs,elements,0.,DeltaTwsEnum,P1Enum);
 	iomodel->ConstantToInput(inputs,elements,0.,DeltaIceThicknessEnum,P1Enum);
 	iomodel->ConstantToInput(inputs,elements,0.,DeltaBottomPressureEnum,P1Enum);
@@ -251,9 +251,6 @@ void SealevelchangeAnalysis::UpdateParameters(Parameters* parameters,IoModel* io
 		} /*}}}*/
 	}
 
-	/*Indicate we have not yet run the Geometry Core module: */
-	parameters->AddObject(new BoolParam(SealevelchangeGeometryDoneEnum,false));
-
 	parameters->FindParam(&grdmodel,GrdModelEnum);
 	parameters->FindParam(&isgrd,SolidearthSettingsGRDEnum);
 	if(grdmodel==ElasticEnum && isgrd){
@@ -672,22 +669,6 @@ void           SealevelchangeAnalysis::Core(FemModel* femmodel){/*{{{*/
 }/*}}}*/
 void           SealevelchangeAnalysis::PreCore(FemModel* femmodel){/*{{{*/
 
-	int isuq=0;
-	int modelid=0;
-
-	/*Resolve Mmes using the modelid, if necessary: meaning if we are running a transient model and that UQ computations have not been triggered:*/
-	femmodel->parameters->FindParam(&isuq,QmuIsdakotaEnum);
-	if (!isuq && femmodel->inputs->GetInputObjectEnum(SolidearthExternalDisplacementEastRateEnum)==DatasetInputEnum){
-		femmodel->parameters->FindParam(&modelid,SolidearthExternalModelidEnum);
-
-		/*replace dataset of forcings with only one, the modelid'th:*/
-		MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementNorthRateEnum, P1Enum);
-		MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementEastRateEnum, P1Enum);
-		MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalDisplacementUpRateEnum, P1Enum);
-		MmeToInputFromIdx(femmodel->inputs,femmodel->elements,femmodel->parameters,modelid-1,SolidearthExternalGeoidRateEnum, P1Enum);
-
-	}		
-
 	/*run sea level change core geometry only once, after the Model Processor is done:*/
 	sealevelchange_initialgeometry(femmodel);
 

src/c/analyses/analyses.h

@@ -37,7 +37,6 @@
 #include "./HydrologyPismAnalysis.h"
 #include "./LevelsetAnalysis.h"
 #include "./MasstransportAnalysis.h"
-#include "./MmemasstransportAnalysis.h"
 #include "./OceantransportAnalysis.h"
 #include "./SamplingAnalysis.h"
 #include "./SmbAnalysis.h"

src/c/cores/cores.h

@@ -34,7 +34,6 @@ void controlm1qn3_core(FemModel* femmodel);
 void controladm1qn3_core(FemModel* femmodel);
 void controlvalidation_core(FemModel* femmodel);
 void masstransport_core(FemModel* femmodel);
-void mmemasstransport_core(FemModel* femmodel);
 void oceantransport_core(FemModel* femmodel);
 void depthaverage_core(FemModel* femmodel);
 void extrudefrombase_core(FemModel* femmodel);
@@ -46,7 +45,6 @@ void slopecompute_core(FemModel* femmodel);
 void steadystate_core(FemModel* femmodel);
 void transient_core(FemModel* femmodel);
 void transient_precore(FemModel* femmodel);
-void transient_postcore(FemModel* femmodel);
 void dakota_core(FemModel* femmodel);
 void ad_core(FemModel* femmodel);
 void adgradient_core(FemModel* femmodel);
@@ -64,7 +62,6 @@ void debris_core(FemModel* femmodel);
 #ifdef _HAVE_SEALEVELCHANGE_
 void sealevelchange_core(FemModel* femmodel);
 void sealevelchange_initialgeometry(FemModel* femmodel);
-void sealevelchange_finalize(FemModel* femmodel);
 SealevelGeometry* sealevelchange_geometry(FemModel* femmodel);
 #endif
 void grd_core(FemModel* femmodel,SealevelGeometry* slgeom);