Skip to content

Commit ea293af

Browse files
larourlarour
committed
Revert "NEW: adding continuous design QMU capabilities and Mmemasstransport"
This reverts commit 122bcd6.
1 parent 122bcd6 commit ea293af

30 files changed

+318
-931
lines changed

‎m4/analyses.m4‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -289,20 +289,6 @@ fi
289289
AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes])
290290
AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION)
291291
dnl }}}
292-
dnl with-HydrologyArmapw{{{
293-
AC_ARG_WITH([HydrologyArmapw],
294-
AS_HELP_STRING([--with-HydrologyArmapw = YES], [compile with HydrologyArmapw capabilities (default is yes)]),
295-
[HYDROLOGYARMAPW=$withval],[HYDROLOGYARMAPW=yes])
296-
AC_MSG_CHECKING(for HydrologyArmapw capability compilation)
297-
298-
HAVE_HYDROLOGYARMAPW=no
299-
if test "x$HYDROLOGYARMAPW" = "xyes"; then
300-
HAVE_HYDROLOGYARMAPW=yes
301-
AC_DEFINE([_HAVE_HYDROLOGYARMAPW_],[1],[with HydrologyArmapw capability])
302-
fi
303-
AM_CONDITIONAL([HYDROLOGYARMAPW], [test x$HAVE_HYDROLOGYARMAPW = xyes])
304-
AC_MSG_RESULT($HAVE_HYDROLOGYARMAPW)
305-
dnl }}}
306292
dnl with-HydrologyDCEfficient{{{
307293
AC_ARG_WITH([HydrologyDCEfficient],
308294
AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]),
@@ -387,6 +373,20 @@ fi
387373
AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes])
388374
AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
389375
dnl }}}
376+
dnl with-HydrologyArmapw{{{
377+
AC_ARG_WITH([HydrologyArmapw],
378+
AS_HELP_STRING([--with-HydrologyArmapw = YES], [compile with HydrologyArmapw capabilities (default is yes)]),
379+
[HYDROLOGYARMAPW=$withval],[HYDROLOGYARMAPW=yes])
380+
AC_MSG_CHECKING(for HydrologyArmapw capability compilation)
381+
382+
HAVE_HYDROLOGYARMAPW=no
383+
if test "x$HYDROLOGYARMAPW" = "xyes"; then
384+
HAVE_HYDROLOGYARMAPW=yes
385+
AC_DEFINE([_HAVE_HYDROLOGYARMAPW_],[1],[with HydrologyArmapw capability])
386+
fi
387+
AM_CONDITIONAL([HYDROLOGYARMAPW], [test x$HAVE_HYDROLOGYARMAPW = xyes])
388+
AC_MSG_RESULT($HAVE_HYDROLOGYARMAPW)
389+
dnl }}}
390390
dnl with-L2ProjectionBase{{{
391391
AC_ARG_WITH([L2ProjectionBase],
392392
AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]),
@@ -457,20 +457,6 @@ fi
457457
AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes])
458458
AC_MSG_RESULT($HAVE_MASSTRANSPORT)
459459
dnl }}}
460-
dnl with-Mmemasstransport{{{
461-
AC_ARG_WITH([Mmemasstransport],
462-
AS_HELP_STRING([--with-Mmemasstransport = YES], [compile with Mmemasstransport capabilities (default is yes)]),
463-
[MMEMASSTRANSPORT=$withval],[MMEMASSTRANSPORT=yes])
464-
AC_MSG_CHECKING(for Mmemasstransport capability compilation)
465-
466-
HAVE_MMEMASSTRANSPORT=no
467-
if test "x$MMEMASSTRANSPORT" = "xyes"; then
468-
HAVE_MMEMASSTRANSPORT=yes
469-
AC_DEFINE([_HAVE_MMEMASSTRANSPORT_],[1],[with Mmemasstransport capability])
470-
fi
471-
AM_CONDITIONAL([MMEMASSTRANSPORT], [test x$HAVE_MMEMASSTRANSPORT = xyes])
472-
AC_MSG_RESULT($HAVE_MMEMASSTRANSPORT)
473-
dnl }}}
474460
dnl with-Melting{{{
475461
AC_ARG_WITH([Melting],
476462
AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]),

‎src/c/Makefile.am‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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@
1+
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@
22
AM_FCFLAGS = @SEMICINCL@
33

44
AUTOMAKE_OPTIONS = subdir-objects
@@ -165,6 +165,7 @@ issm_sources += \
165165
./shared/Numerics/extrema.cpp \
166166
./shared/Numerics/legendre.cpp \
167167
./shared/Numerics/XZvectorsToCoordinateSystem.cpp \
168+
./shared/Numerics/Normals.cpp \
168169
./shared/Exceptions/Exceptions.cpp \
169170
./shared/Sorting/binary_search.cpp \
170171
./shared/Elements/Cuffey.cpp \
@@ -196,7 +197,6 @@ issm_sources += \
196197
./toolkits/mpi/commops/GetOwnershipBoundariesFromRange.cpp \
197198
./toolkits/ToolkitOptions.cpp \
198199
./modules/MmeToInputFromIdx/MmeToInputFromIdx.cpp\
199-
./modules/MmeToInputx/MmeToInputx.cpp\
200200
./modules/ModelProcessorx/ModelProcessorx.cpp \
201201
./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp \
202202
./modules/ModelProcessorx/NodesPartitioning.cpp \
@@ -248,7 +248,6 @@ issm_sources += \
248248
./modules/Solverx/Solverx.cpp \
249249
./modules/StochasticForcingx/StochasticForcingx.cpp \
250250
./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp \
251-
./modules/UpdateMmesx/UpdateMmesx.cpp \
252251
./cores/ProcessArguments.cpp \
253252
./cores/ResetBoundaryConditions.cpp \
254253
./cores/WrapperCorePointerFromSolutionEnum.cpp \
@@ -275,7 +274,6 @@ issm_sources += \
275274
./cores/transient_core.cpp \
276275
./cores/steadystate_core.cpp \
277276
./cores/masstransport_core.cpp \
278-
./cores/mmemasstransport_core.cpp \
279277
./cores/oceantransport_core.cpp \
280278
./cores/depthaverage_core.cpp \
281279
./cores/extrudefrombase_core.cpp \
@@ -346,7 +344,7 @@ issm_sources += \
346344
./classes/Inputs/DatasetInput.cpp \
347345
./classes/Inputs/ControlInput.cpp \
348346
./classes/Inputs/TransientInput.cpp \
349-
./classes/Inputs/ArrayInput.cpp\
347+
./classes/Inputs/ArrayInput.cpp \
350348
./classes/Inputs/IntArrayInput.cpp
351349
#}}}
352350
# ADJOINTMPI/MeDiPack sources {{{
@@ -499,8 +497,7 @@ if MELTING
499497
issm_sources += ./analyses/MeltingAnalysis.cpp
500498
endif
501499
if MASSTRANSPORT
502-
issm_sources += ./analyses/MasstransportAnalysis.cpp \
503-
./analyses/MmemasstransportAnalysis.cpp
500+
issm_sources += ./analyses/MasstransportAnalysis.cpp
504501
endif
505502
if OCEANTRANSPORT
506503
issm_sources += ./analyses/OceantransportAnalysis.cpp
@@ -544,7 +541,28 @@ if LOVE
544541
if FORTRAN
545542
issm_sources += \
546543
./cores/love_core.cpp \
547-
./analyses/LoveAnalysis.cpp
544+
./analyses/LoveAnalysis.cpp \
545+
./modules/Zgesvx/Zgesvx.cpp \
546+
./modules/Zgesvx/Zgesvx.h \
547+
./modules/Zgesvx/dcabs1.f \
548+
./modules/Zgesvx/dlamch.f \
549+
./modules/Zgesvx/ieeeck.f \
550+
./modules/Zgesvx/ilaenv.f \
551+
./modules/Zgesvx/iparmq.f \
552+
./modules/Zgesvx/izamax.f \
553+
./modules/Zgesvx/lsame.f \
554+
./modules/Zgesvx/xerbla.f \
555+
./modules/Zgesvx/zgemm.f \
556+
./modules/Zgesvx/zgeru.f \
557+
./modules/Zgesvx/zgesv.f \
558+
./modules/Zgesvx/zgetf2.f \
559+
./modules/Zgesvx/zgetrf2.f \
560+
./modules/Zgesvx/zgetrf.f \
561+
./modules/Zgesvx/zgetrs.f \
562+
./modules/Zgesvx/zlaswp.f \
563+
./modules/Zgesvx/zscal.f \
564+
./modules/Zgesvx/zswap.f \
565+
./modules/Zgesvx/ztrsm.f
548566
endif
549567
endif
550568
#}}}
@@ -722,8 +740,7 @@ endif
722740
libISSMCore_la_SOURCES = $(issm_sources)
723741
libISSMCore_la_CXXFLAGS = $(ALL_CXXFLAGS)
724742
libISSMCore_la_FFLAGS = $(AM_FFLAGS)
725-
726-
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)
743+
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)
727744
if FORTRAN
728745
libISSMCore_LIB_ADD += $(FLIBS) $(FORTRANLIB)
729746
endif
@@ -819,6 +836,14 @@ endif
819836
endif
820837
endif
821838

839+
if !STANDALONE_LIBRARIES
840+
if MAC
841+
if PROJ
842+
libISSMCore_la_LDFLAGS += -Wl,-rpath,$(PROJROOT)/lib
843+
endif
844+
endif
845+
endif
846+
822847
if !MSYS2
823848
libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp
824849
libISSMOverload_la_CFLAGS = -D_C_ -fPIC $(CFLAGS) $(CXXFLAGS)
@@ -855,7 +880,7 @@ LDADD += ./libISSMModules.la $(TRIANGLELIB)
855880
endif
856881

857882
# External packages
858-
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)
883+
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)
859884

860885
if FORTRAN
861886
LDADD += $(FLIBS) $(FORTRANLIB)

‎src/c/analyses/EnumToAnalysis.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ Analysis* EnumToAnalysis(int analysis_enum){
109109
#ifdef _HAVE_MASSTRANSPORT_
110110
case MasstransportAnalysisEnum : return new MasstransportAnalysis();
111111
#endif
112-
#ifdef _HAVE_MMEMASSTRANSPORT_
113-
case MmemasstransportAnalysisEnum : return new MmemasstransportAnalysis();
114-
#endif
115112
#ifdef _HAVE_MELTING_
116113
case MeltingAnalysisEnum : return new MeltingAnalysis();
117114
#endif

‎src/c/analyses/MmemasstransportAnalysis.cpp‎

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎src/c/analyses/MmemasstransportAnalysis.h‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/c/analyses/OceantransportAnalysis.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ void OceantransportAnalysis::UpdateElements(Elements* elements,Inputs* inputs,Io
4949
iomodel->FetchData(&modelid,"md.dsl.modelid");
5050

5151
/*replace dataset of forcings with only one, the modelid'th:*/
52-
MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcbottompressureEnum, P1Enum);
53-
MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcdslEnum, P1Enum);
54-
MmeToInputFromIdx(inputs,elements,NULL,modelid,OceantransportSpcstrEnum, P0Enum);
52+
MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcbottompressureEnum, P1Enum);
53+
MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcdslEnum, P1Enum);
54+
MmeToInputFromIdx(inputs,elements,modelid,OceantransportSpcstrEnum, P0Enum);
5555
}
5656

5757
/*Initialize sea level cumulated sea level loads :*/

0 commit comments

Comments
 (0)