Skip to content

Commit 0cb446a

Browse files
dicenginedicengine
committed
removed unused fields
AFFINE_ ... and QUAD_...NM!
1 parent dfdcc03 commit 0cb446a

File tree

2 files changed

+1
-109
lines changed

2 files changed

+1
-109
lines changed

‎src/base/DICe_FieldEnums.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,6 @@ void create_string_maps()
156156
field_name_string[field_enums::QUAD_J] = "QUAD_J";
157157
field_name_string[field_enums::QUAD_K] = "QUAD_K";
158158
field_name_string[field_enums::QUAD_L] = "QUAD_L";
159-
field_name_string[field_enums::AFFINE_A] = "AFFINE_A";
160-
field_name_string[field_enums::AFFINE_B] = "AFFINE_B";
161-
field_name_string[field_enums::AFFINE_C] = "AFFINE_C";
162-
field_name_string[field_enums::AFFINE_D] = "AFFINE_D";
163-
field_name_string[field_enums::AFFINE_E] = "AFFINE_E";
164-
field_name_string[field_enums::AFFINE_F] = "AFFINE_F";
165-
field_name_string[field_enums::AFFINE_G] = "AFFINE_G";
166-
field_name_string[field_enums::AFFINE_H] = "AFFINE_H";
167-
field_name_string[field_enums::AFFINE_I] = "AFFINE_I";
168159
field_name_string[field_enums::FIELD_1] = "FIELD_1";
169160
field_name_string[field_enums::FIELD_2] = "FIELD_2";
170161
field_name_string[field_enums::FIELD_3] = "FIELD_3";

‎src/base/DICe_FieldEnums.h‎

Lines changed: 1 addition & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,6 @@ Field_Name
135135
BLOCK_ID,
136136
PROCESSOR_ID,
137137
MASTER_NODE_ID,
138-
AFFINE_A,
139-
AFFINE_B,
140-
AFFINE_C,
141-
AFFINE_D,
142-
AFFINE_E,
143-
AFFINE_F,
144-
AFFINE_G,
145-
AFFINE_H,
146-
AFFINE_I,
147138
QUAD_A,
148139
QUAD_B,
149140
QUAD_C,
@@ -532,90 +523,30 @@ const Field_Spec NORMAL_STRETCH_YY_FS(field_enums::SCALAR_FIELD_TYPE,field_enums
532523
/// field spec
533524
const Field_Spec NORMAL_STRETCH_YY_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::NORMAL_STRETCH_YY,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
534525
/// field spec
535-
const Field_Spec AFFINE_A_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_A,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
536-
/// field spec
537-
const Field_Spec AFFINE_A_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_A,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
538-
/// field spec
539-
const Field_Spec AFFINE_B_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_B,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
540-
/// field spec
541-
const Field_Spec AFFINE_B_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_B,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
542-
/// field spec
543-
const Field_Spec AFFINE_C_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_C,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
544-
/// field spec
545-
const Field_Spec AFFINE_C_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_C,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
546-
/// field spec
547-
const Field_Spec AFFINE_D_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_D,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
548-
/// field spec
549-
const Field_Spec AFFINE_D_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_D,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
550-
/// field spec
551-
const Field_Spec AFFINE_E_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_E,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
552-
/// field spec
553-
const Field_Spec AFFINE_E_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_E,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
554-
/// field spec
555-
const Field_Spec AFFINE_F_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_F,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
556-
/// field spec
557-
const Field_Spec AFFINE_F_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_F,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
558-
/// field spec
559-
const Field_Spec AFFINE_G_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_G,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
560-
/// field spec
561-
const Field_Spec AFFINE_G_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_G,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
562-
/// field spec
563-
const Field_Spec AFFINE_H_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_H,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
564-
/// field spec
565-
const Field_Spec AFFINE_H_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_H,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
566-
/// field spec
567-
const Field_Spec AFFINE_I_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_I,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
568-
/// field spec
569-
const Field_Spec AFFINE_I_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::AFFINE_I,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
570-
/// field spec
571526
const Field_Spec QUAD_A_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_A,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
572527
/// field spec
573-
const Field_Spec QUAD_A_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_A,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
574-
/// field spec
575528
const Field_Spec QUAD_B_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_B,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
576529
/// field spec
577-
const Field_Spec QUAD_B_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_B,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
578-
/// field spec
579530
const Field_Spec QUAD_C_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_C,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
580531
/// field spec
581-
const Field_Spec QUAD_C_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_C,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
582-
/// field spec
583532
const Field_Spec QUAD_D_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_D,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
584533
/// field spec
585-
const Field_Spec QUAD_D_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_D,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
586-
/// field spec
587534
const Field_Spec QUAD_E_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_E,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
588535
/// field spec
589-
const Field_Spec QUAD_E_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_E,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
590-
/// field spec
591536
const Field_Spec QUAD_F_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_F,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
592537
/// field spec
593-
const Field_Spec QUAD_F_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_F,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
594-
/// field spec
595538
const Field_Spec QUAD_G_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_G,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
596539
/// field spec
597-
const Field_Spec QUAD_G_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_G,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
598-
/// field spec
599540
const Field_Spec QUAD_H_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_H,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
600541
/// field spec
601-
const Field_Spec QUAD_H_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_H,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
602-
/// field spec
603542
const Field_Spec QUAD_I_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_I,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
604543
/// field spec
605-
const Field_Spec QUAD_I_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_I,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
606-
/// field spec
607544
const Field_Spec QUAD_J_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_J,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
608545
/// field spec
609-
const Field_Spec QUAD_J_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_J,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
610-
/// field spec
611546
const Field_Spec QUAD_K_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_K,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
612547
/// field spec
613-
const Field_Spec QUAD_K_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_K,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
614-
/// field spec
615548
const Field_Spec QUAD_L_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_L,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
616549
/// field spec
617-
const Field_Spec QUAD_L_NM1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::QUAD_L,field_enums::NODE_RANK,field_enums::STATE_N_MINUS_ONE,false,true);
618-
/// field spec
619550
const Field_Spec FIELD_1_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::FIELD_1,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
620551
/// field spec
621552
const Field_Spec FIELD_2_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::FIELD_2,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
@@ -723,7 +654,7 @@ const Field_Spec NLVC_STRAIN_XY_ERROR_FS(field_enums::SCALAR_FIELD_TYPE,field_en
723654
const Field_Spec NLVC_STRAIN_YY_ERROR_FS(field_enums::SCALAR_FIELD_TYPE,field_enums::NLVC_STRAIN_YY_ERROR,field_enums::NODE_RANK,field_enums::NO_FIELD_STATE,true);
724655

725656
/// the number of fields that have been defined (must be set at compile time)
726-
const int_t num_fields_defined = 156;
657+
const int_t num_fields_defined = 126;
727658

728659
/// array of all the valid field specs
729660
const field_enums::Field_Spec fs_spec_vec[num_fields_defined] = {
@@ -793,47 +724,17 @@ const field_enums::Field_Spec fs_spec_vec[num_fields_defined] = {
793724
PROCESSOR_ID_FS,
794725
MASTER_NODE_ID_FS,
795726
QUAD_A_FS,
796-
QUAD_A_NM1_FS,
797727
QUAD_B_FS,
798-
QUAD_B_NM1_FS,
799728
QUAD_C_FS,
800-
QUAD_C_NM1_FS,
801729
QUAD_D_FS,
802-
QUAD_D_NM1_FS,
803730
QUAD_E_FS,
804-
QUAD_E_NM1_FS,
805731
QUAD_F_FS,
806-
QUAD_F_NM1_FS,
807732
QUAD_G_FS,
808-
QUAD_G_NM1_FS,
809733
QUAD_H_FS,
810-
QUAD_H_NM1_FS,
811734
QUAD_I_FS,
812-
QUAD_I_NM1_FS,
813735
QUAD_J_FS,
814-
QUAD_J_NM1_FS,
815736
QUAD_K_FS,
816-
QUAD_K_NM1_FS,
817737
QUAD_L_FS,
818-
QUAD_L_NM1_FS,
819-
AFFINE_A_FS,
820-
AFFINE_A_NM1_FS,
821-
AFFINE_B_FS,
822-
AFFINE_B_NM1_FS,
823-
AFFINE_C_FS,
824-
AFFINE_C_NM1_FS,
825-
AFFINE_D_FS,
826-
AFFINE_D_NM1_FS,
827-
AFFINE_E_FS,
828-
AFFINE_E_NM1_FS,
829-
AFFINE_F_FS,
830-
AFFINE_F_NM1_FS,
831-
AFFINE_G_FS,
832-
AFFINE_G_NM1_FS,
833-
AFFINE_H_FS,
834-
AFFINE_H_NM1_FS,
835-
AFFINE_I_FS,
836-
AFFINE_I_NM1_FS,
837738
FIELD_1_FS,
838739
FIELD_2_FS,
839740
FIELD_3_FS,

0 commit comments

Comments
 (0)