CHG: Synchronized enums after pull and merge

ISSMteam · Jul 27, 2024 · 8d404e5 · 8d404e5
1 parent 0db7fc2
commit 8d404e5
Show file tree

Hide file tree

Showing 6 changed files with 5,503 additions and 72 deletions.
diff --git a/jenkins/mac-intel-full b/jenkins/mac-intel-full
@@ -23,7 +23,7 @@ ISSM_CONFIG='\
 	--with-python-version=3.9 \
 	--with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
 	--with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
-	--with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
+	--with-fortran-lib="-L/usr/local/Cellar/gcc/14.1.0_2/lib/gcc/current -lgfortran" \
 	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
 	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
 	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \

diff --git a/src/c/shared/Enum/Enum.vim b/src/c/shared/Enum/Enum.vim
@@ -51,6 +51,7 @@ syn keyword cConstant AugmentedLagrangianThetaEnum
 syn keyword cConstant AutodiffCbufsizeEnum
 syn keyword cConstant AutodiffDependentObjectsEnum
 syn keyword cConstant AutodiffDriverEnum
+syn keyword cConstant AutodiffEnablePreaccumulationEnum
 syn keyword cConstant AutodiffFosForwardIndexEnum
 syn keyword cConstant AutodiffFosReverseIndexEnum
 syn keyword cConstant AutodiffFovForwardIndicesEnum
@@ -61,6 +62,8 @@ syn keyword cConstant AutodiffLbufsizeEnum
 syn keyword cConstant AutodiffNumDependentsEnum
 syn keyword cConstant AutodiffNumIndependentsEnum
 syn keyword cConstant AutodiffObufsizeEnum
+syn keyword cConstant AutodiffOutputTapeMemoryEnum
+syn keyword cConstant AutodiffOutputTimeEnum
 syn keyword cConstant AutodiffTapeAllocEnum
 syn keyword cConstant AutodiffTbufsizeEnum
 syn keyword cConstant AutodiffXpEnum
@@ -267,6 +270,8 @@ syn keyword cConstant HydrologyCavitySpacingEnum
 syn keyword cConstant HydrologyChannelSheetWidthEnum
 syn keyword cConstant HydrologyEnglacialVoidRatioEnum
 syn keyword cConstant HydrologyIschannelsEnum
+syn keyword cConstant HydrologyIsIncludeSheetThicknessEnum
+syn keyword cConstant HydrologyCreepOpenFlagEnum
 syn keyword cConstant HydrologyIsTransitionEnum
 syn keyword cConstant HydrologyIsWaterPressureArmaEnum
 syn keyword cConstant HydrologyMeltFlagEnum
@@ -1408,7 +1413,6 @@ syn keyword cConstant AgeAnalysisEnum
 syn keyword cConstant AggressiveMigrationEnum
 syn keyword cConstant AmrBamgEnum
 syn keyword cConstant AmrNeopzEnum
-syn keyword cConstant AndroidFrictionCoefficientEnum
 syn keyword cConstant ArrheniusEnum
 syn keyword cConstant AutodiffJacobianEnum
 syn keyword cConstant Balancethickness2AnalysisEnum

diff --git a/src/c/shared/Enum/EnumToStringx.cpp b/src/c/shared/Enum/EnumToStringx.cpp
@@ -272,6 +272,8 @@ const char* EnumToStringx(int en){
 		case HydrologyChannelSheetWidthEnum : return "HydrologyChannelSheetWidth";
 		case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio";
 		case HydrologyIschannelsEnum : return "HydrologyIschannels";
+		case HydrologyIsIncludeSheetThicknessEnum : return "HydrologyIsIncludeSheetThickness";
+		case HydrologyCreepOpenFlagEnum : return "HydrologyCreepOpenFlag";
 		case HydrologyIsTransitionEnum : return "HydrologyIsTransition";
 		case HydrologyIsWaterPressureArmaEnum : return "HydrologyIsWaterPressureArma";
 		case HydrologyMeltFlagEnum : return "HydrologyMeltFlag";

diff --git a/src/c/shared/Enum/Enumjl.vim b/src/c/shared/Enum/Enumjl.vim
@@ -44,6 +44,7 @@ syn keyword juliaConstC AugmentedLagrangianThetaEnum
 syn keyword juliaConstC AutodiffCbufsizeEnum
 syn keyword juliaConstC AutodiffDependentObjectsEnum
 syn keyword juliaConstC AutodiffDriverEnum
+syn keyword juliaConstC AutodiffEnablePreaccumulationEnum
 syn keyword juliaConstC AutodiffFosForwardIndexEnum
 syn keyword juliaConstC AutodiffFosReverseIndexEnum
 syn keyword juliaConstC AutodiffFovForwardIndicesEnum
@@ -54,6 +55,8 @@ syn keyword juliaConstC AutodiffLbufsizeEnum
 syn keyword juliaConstC AutodiffNumDependentsEnum
 syn keyword juliaConstC AutodiffNumIndependentsEnum
 syn keyword juliaConstC AutodiffObufsizeEnum
+syn keyword juliaConstC AutodiffOutputTapeMemoryEnum
+syn keyword juliaConstC AutodiffOutputTimeEnum
 syn keyword juliaConstC AutodiffTapeAllocEnum
 syn keyword juliaConstC AutodiffTbufsizeEnum
 syn keyword juliaConstC AutodiffXpEnum
@@ -260,6 +263,8 @@ syn keyword juliaConstC HydrologyCavitySpacingEnum
 syn keyword juliaConstC HydrologyChannelSheetWidthEnum
 syn keyword juliaConstC HydrologyEnglacialVoidRatioEnum
 syn keyword juliaConstC HydrologyIschannelsEnum
+syn keyword juliaConstC HydrologyIsIncludeSheetThicknessEnum
+syn keyword juliaConstC HydrologyCreepOpenFlagEnum
 syn keyword juliaConstC HydrologyIsTransitionEnum
 syn keyword juliaConstC HydrologyIsWaterPressureArmaEnum
 syn keyword juliaConstC HydrologyMeltFlagEnum
@@ -1401,7 +1406,6 @@ syn keyword juliaConstC AgeAnalysisEnum
 syn keyword juliaConstC AggressiveMigrationEnum
 syn keyword juliaConstC AmrBamgEnum
 syn keyword juliaConstC AmrNeopzEnum
-syn keyword juliaConstC AndroidFrictionCoefficientEnum
 syn keyword juliaConstC ArrheniusEnum
 syn keyword juliaConstC AutodiffJacobianEnum
 syn keyword juliaConstC Balancethickness2AnalysisEnum