From 5cd8934d574a769d11ae34a6ea0e3c61c4a1bc08 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 10 Aug 2023 14:53:41 -0400 Subject: [PATCH] remove aux_names vector this seems to be a holdover from when we copied things from Fortran but we can access the names directly from network_properties.H --- Source/driver/Castro_setup.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Source/driver/Castro_setup.cpp b/Source/driver/Castro_setup.cpp index c17bd8937b..2303a9b9b3 100644 --- a/Source/driver/Castro_setup.cpp +++ b/Source/driver/Castro_setup.cpp @@ -525,17 +525,11 @@ Castro::variableSetUp () } #if NAUX_NET > 0 - // Get the auxiliary names from the network model. - std::vector aux_names; - for (int i = 0; i < NumAux; i++) { - aux_names.push_back(short_aux_names_cxx[i]); - } - if ( ParallelDescriptor::IOProcessor()) { std::cout << NumAux << " Auxiliary Variables: " << std::endl; for (int i = 0; i < NumAux; i++) { - std::cout << aux_names[i] << ' ' << ' '; + std::cout << short_aux_names_cxx[i] << ' ' << ' '; } std::cout << std::endl; } @@ -544,7 +538,7 @@ Castro::variableSetUp () { set_scalar_bc(bc, phys_bc); bcs[UFX+i] = bc; - name[UFX+i] = "rho_" + aux_names[i]; + name[UFX+i] = "rho_" + short_aux_names_cxx[i]; } #endif @@ -1010,9 +1004,9 @@ Castro::variableSetUp () #if NAUX_NET > 0 for (int i = 0; i < NumAux; i++) { - derive_lst.add(aux_names[i],IndexType::TheCellType(),1,ca_derspec,the_same_box); - derive_lst.addComponent(aux_names[i],desc_lst,State_Type,URHO,1); - derive_lst.addComponent(aux_names[i],desc_lst,State_Type,UFX+i,1); + derive_lst.add(short_aux_names_cxx[i], IndexType::TheCellType(), 1, ca_derspec, the_same_box); + derive_lst.addComponent(short_aux_names_cxx[i], desc_lst, State_Type, URHO, 1); + derive_lst.addComponent(short_aux_names_cxx[i], desc_lst, State_Type, UFX+i, 1); } #endif