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

…nsport"

This reverts commit 122bcd6.

m4/analyses.m4

@@ -289,20 +289,6 @@ fi
 AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes])
 AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION)
 dnl }}}
-dnl with-HydrologyArmapw{{{
-AC_ARG_WITH([HydrologyArmapw],
-	AS_HELP_STRING([--with-HydrologyArmapw = YES], [compile with HydrologyArmapw capabilities (default is yes)]),
-	[HYDROLOGYARMAPW=$withval],[HYDROLOGYARMAPW=yes])
-AC_MSG_CHECKING(for HydrologyArmapw capability compilation)
-
-HAVE_HYDROLOGYARMAPW=no 
-if test "x$HYDROLOGYARMAPW" = "xyes"; then
-	HAVE_HYDROLOGYARMAPW=yes
-	AC_DEFINE([_HAVE_HYDROLOGYARMAPW_],[1],[with HydrologyArmapw capability])
-fi
-AM_CONDITIONAL([HYDROLOGYARMAPW], [test x$HAVE_HYDROLOGYARMAPW = xyes])
-AC_MSG_RESULT($HAVE_HYDROLOGYARMAPW)
-dnl }}}
 dnl with-HydrologyDCEfficient{{{
 AC_ARG_WITH([HydrologyDCEfficient],
 	AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]),
@@ -387,6 +373,20 @@ fi
 AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes])
 AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
 dnl }}}
+dnl with-HydrologyArmapw{{{
+AC_ARG_WITH([HydrologyArmapw],
+	AS_HELP_STRING([--with-HydrologyArmapw = YES], [compile with HydrologyArmapw capabilities (default is yes)]),
+	[HYDROLOGYARMAPW=$withval],[HYDROLOGYARMAPW=yes])
+AC_MSG_CHECKING(for HydrologyArmapw capability compilation)
+
+HAVE_HYDROLOGYARMAPW=no 
+if test "x$HYDROLOGYARMAPW" = "xyes"; then
+	HAVE_HYDROLOGYARMAPW=yes
+	AC_DEFINE([_HAVE_HYDROLOGYARMAPW_],[1],[with HydrologyArmapw capability])
+fi
+AM_CONDITIONAL([HYDROLOGYARMAPW], [test x$HAVE_HYDROLOGYARMAPW = xyes])
+AC_MSG_RESULT($HAVE_HYDROLOGYARMAPW)
+dnl }}}
 dnl with-L2ProjectionBase{{{
 AC_ARG_WITH([L2ProjectionBase],
 	AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]),
@@ -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

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@ @PROJINCL@ @MPLAPACKINCL@
+AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @ESMFINCL@ @PROJINCL@ @MPLAPACKINCL@
 AM_FCFLAGS = @SEMICINCL@
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -165,6 +165,7 @@ issm_sources += \
 	./shared/Numerics/extrema.cpp \
 	./shared/Numerics/legendre.cpp \
 	./shared/Numerics/XZvectorsToCoordinateSystem.cpp \
+	./shared/Numerics/Normals.cpp \
 	./shared/Exceptions/Exceptions.cpp \
 	./shared/Sorting/binary_search.cpp \
 	./shared/Elements/Cuffey.cpp \
@@ -196,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 \
@@ -248,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 \
@@ -275,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 \
@@ -346,7 +344,7 @@ issm_sources += \
 	./classes/Inputs/DatasetInput.cpp \
 	./classes/Inputs/ControlInput.cpp \
 	./classes/Inputs/TransientInput.cpp \
-	./classes/Inputs/ArrayInput.cpp\
+	./classes/Inputs/ArrayInput.cpp \
 	./classes/Inputs/IntArrayInput.cpp
 #}}}
 # ADJOINTMPI/MeDiPack sources {{{
@@ -499,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
@@ -544,7 +541,28 @@ if LOVE
 if FORTRAN
 issm_sources += \
 	./cores/love_core.cpp \
-	./analyses/LoveAnalysis.cpp
+	./analyses/LoveAnalysis.cpp \
+	./modules/Zgesvx/Zgesvx.cpp \
+	./modules/Zgesvx/Zgesvx.h \
+	./modules/Zgesvx/dcabs1.f \
+	./modules/Zgesvx/dlamch.f \
+	./modules/Zgesvx/ieeeck.f \
+	./modules/Zgesvx/ilaenv.f \
+	./modules/Zgesvx/iparmq.f \
+	./modules/Zgesvx/izamax.f \
+	./modules/Zgesvx/lsame.f \
+	./modules/Zgesvx/xerbla.f \
+	./modules/Zgesvx/zgemm.f \
+	./modules/Zgesvx/zgeru.f \
+	./modules/Zgesvx/zgesv.f \
+	./modules/Zgesvx/zgetf2.f \
+	./modules/Zgesvx/zgetrf2.f \
+	./modules/Zgesvx/zgetrf.f \
+	./modules/Zgesvx/zgetrs.f \
+	./modules/Zgesvx/zlaswp.f \
+	./modules/Zgesvx/zscal.f \
+	./modules/Zgesvx/zswap.f \
+	./modules/Zgesvx/ztrsm.f
 endif
 endif
 #}}}
@@ -722,8 +740,7 @@ endif
 libISSMCore_la_SOURCES  = $(issm_sources)
 libISSMCore_la_CXXFLAGS = $(ALL_CXXFLAGS)
 libISSMCore_la_FFLAGS = $(AM_FFLAGS)
-
-libISSMCore_LIB_ADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) 
+libISSMCore_LIB_ADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB)
 if FORTRAN
 libISSMCore_LIB_ADD += $(FLIBS) $(FORTRANLIB)
 endif
@@ -819,6 +836,14 @@ endif
 endif
 endif
 
+if !STANDALONE_LIBRARIES
+if MAC
+if PROJ
+libISSMCore_la_LDFLAGS += -Wl,-rpath,$(PROJROOT)/lib
+endif
+endif
+endif
+
 if !MSYS2
 libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp
 libISSMOverload_la_CFLAGS  = -D_C_ -fPIC $(CFLAGS) $(CXXFLAGS)
@@ -855,7 +880,7 @@ LDADD += ./libISSMModules.la $(TRIANGLELIB)
 endif
 
 # External packages
-LDADD += $(DAKOTALIB) $(SEMICLIB) $(M1QN3LIB) $(CHACOLIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB)
+LDADD += $(DAKOTALIB) $(SEMICLIB) $(M1QN3LIB) $(CHACOLIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(ESMFLIB)
 
 if FORTRAN
 LDADD += $(FLIBS) $(FORTRANLIB)

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 :*/