delete GetDiagonalInterAll_simple

Author: 三澤貴宏

src/include/readdef.h

@@ -102,6 +102,11 @@ int CheckInterAllHermite_simple
                 const int iCalcModel
         );
 
+typedef enum {
+  INTERALL_SPLIT_MODEL_FILTERED = 0,
+  INTERALL_SPLIT_SIMPLE = 1
+} InterAllSplitMode;
+
 
 /*
 int GetDiagonalInterAll
@@ -123,25 +128,10 @@ int GetDiagonalInterAll
                                 int *SpinChemi,
                                 double *ParaChemi,
                                 unsigned int *NChemi,
-                                const int iCalcModel
+                                const int iCalcModel,
+                                const InterAllSplitMode split_mode
                 );
 
-int GetDiagonalInterAll_simple
-        (
-                int **InterAll,
-                complex double *ParaInterAll,
-                const int NInterAll,
-                int **InterAllDiagonal,
-                double *ParaInterAllDiagonal,
-                int **InterAllOffDiagonal,
-                complex double *ParaInterAllOffDiagonal,
-                int *Chemi,
-                int *SpinChemi,
-                double *ParaChemi,
-                unsigned int *NChemi,
-                const int iCalcModel
-        );
-
 int ArrangeInterAllOffDiagonal
 (
  const int NInterAllOffDiagonal,

src/readdef.c

@@ -1583,9 +1583,13 @@ int GetDiagonalInterAll
                 int *SpinChemi,
                 double *ParaChemi,
                 unsigned int *NChemi,
-                const int iCalcModel
+                const int iCalcModel,
+                const InterAllSplitMode split_mode
         )
 {
+  const int apply_model_filter =
+          (split_mode == INTERALL_SPLIT_SIMPLE) ? FALSE : TRUE;
+
   return SplitDiagonalAndOffDiagonalInterAll(
           InterAll,
           ParaInterAll,
@@ -1599,39 +1603,7 @@ int GetDiagonalInterAll
           ParaChemi,
           NChemi,
           iCalcModel,
-          TRUE);
-}
-
-int GetDiagonalInterAll_simple
-        (
-                int **InterAll,
-                complex double *ParaInterAll,
-                const int NInterAll,
-                int **InterAllDiagonal,
-                double *ParaInterAllDiagonal,
-                int **InterAllOffDiagonal,
-                complex double *ParaInterAllOffDiagonal,
-                int *Chemi,
-                int *SpinChemi,
-                double *ParaChemi,
-                unsigned int *NChemi,
-                const int iCalcModel
-        )
-{
-    return SplitDiagonalAndOffDiagonalInterAll(
-            InterAll,
-            ParaInterAll,
-            NInterAll,
-            InterAllDiagonal,
-            ParaInterAllDiagonal,
-            InterAllOffDiagonal,
-            ParaInterAllOffDiagonal,
-            Chemi,
-            SpinChemi,
-            ParaChemi,
-            NChemi,
-            iCalcModel,
-            FALSE);
+          apply_model_filter);
 }
 
 int ArrangeInterAllOffDiagonal

src/readdef_idx_parser.c

@@ -467,12 +467,13 @@ static int ParseIdxInterAllDef(FILE *fp, const char *defname, struct DefineList
   X->NInterAll_Diagonal = icnt_diagonal;
   X->NInterAll_OffDiagonal = X->NInterAll - X->NInterAll_Diagonal;
 
-  if (GetDiagonalInterAll_simple(
+  if (GetDiagonalInterAll(
           X->InterAll, X->ParaInterAll, X->NInterAll,
           X->InterAll_Diagonal, X->ParaInterAll_Diagonal,
           X->InterAll_OffDiagonal, X->ParaInterAll_OffDiagonal,
           X->EDChemi, X->EDSpinChemi, X->EDParaChemi, &X->EDNChemi,
-          X->iCalcModel) != 0) {
+          X->iCalcModel,
+          INTERALL_SPLIT_SIMPLE) != 0) {
     return -1;
   }
 
@@ -769,11 +770,12 @@ static int ParseIdxTETwoBodyDef(FILE *fp, const char *defname, struct DefineList
     X->NTEInterAllDiagonal[idx] = icnt_diagonal;
     X->NTEInterAllOffDiagonal[idx] = icnt_interall - icnt_diagonal;
 
-    if (GetDiagonalInterAll_simple(
+    if (GetDiagonalInterAll(
             X->TEInterAll[idx], X->ParaTEInterAll[idx], X->NTEInterAll[idx],
             X->TEInterAllDiagonal[idx], X->ParaTEInterAllDiagonal[idx],
             X->TEInterAllOffDiagonal[idx], X->ParaTEInterAllOffDiagonal[idx],
-            X->TEChemi[idx], X->SpinTEChemi[idx], X->ParaTEChemi[idx], &X->NTEChemi[idx], X->iCalcModel) != 0) {
+            X->TEChemi[idx], X->SpinTEChemi[idx], X->ParaTEChemi[idx], &X->NTEChemi[idx], X->iCalcModel,
+            INTERALL_SPLIT_SIMPLE) != 0) {
       return -1;
     }