User: rhaas Date: 2014/04/18 02:17 PM
Modified: /trunk/src/ MoL_registration.C
Log: simplify RHS registration code by removing duplicates
File Changes:
Directory: /trunk/src/ ======================
File [modified]: MoL_registration.C Delta lines: +12 -52 =================================================================== --- trunk/src/MoL_registration.C 2014-04-18 19:16:27 UTC (rev 27) +++ trunk/src/MoL_registration.C 2014-04-18 19:17:12 UTC (rev 28) @@ -7,7 +7,7 @@ #include "cctk.h" #include <cstdio> #include <cmath> -#include <stddef.h> +#include <cstddef> #include "cctk_Parameters.h" #include "cctk_Arguments.h"
@@ -22,76 +22,36 @@
// Register evolution & RHS gridfunction groups
- /* Ax and Ax_rhs */ - group = CCTK_GroupIndex("IllinoisGRMHD::em_Ax"); - rhs = CCTK_GroupIndex("IllinoisGRMHD::em_Ax_rhs"); - - if (CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) + if (!CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) { - ierr += MoLRegisterEvolvedGroup(group, rhs); - } - else - { CCTK_WARN(0, "MoL function not aliased"); - ierr++; }
+ /* Ax and Ax_rhs */ + group = CCTK_GroupIndex("IllinoisGRMHD::em_Ax"); + rhs = CCTK_GroupIndex("IllinoisGRMHD::em_Ax_rhs"); + ierr += MoLRegisterEvolvedGroup(group, rhs); + /* Ay and Ay_rhs */ group = CCTK_GroupIndex("IllinoisGRMHD::em_Ay"); rhs = CCTK_GroupIndex("IllinoisGRMHD::em_Ay_rhs"); + ierr += MoLRegisterEvolvedGroup(group, rhs);
- if (CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) - { - ierr += MoLRegisterEvolvedGroup(group, rhs); - } - else - { - CCTK_WARN(0, "MoL function not aliased"); - ierr++; - } - /* Az and Az_rhs */ group = CCTK_GroupIndex("IllinoisGRMHD::em_Az"); rhs = CCTK_GroupIndex("IllinoisGRMHD::em_Az_rhs"); + ierr += MoLRegisterEvolvedGroup(group, rhs);
- if (CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) - { - ierr += MoLRegisterEvolvedGroup(group, rhs); - } - else - { - CCTK_WARN(0, "MoL function not aliased"); - ierr++; - } - /* psi6phi and psi6phi_rhs */ group = CCTK_GroupIndex("IllinoisGRMHD::em_psi6phi"); rhs = CCTK_GroupIndex("IllinoisGRMHD::em_psi6phi_rhs"); + ierr += MoLRegisterEvolvedGroup(group, rhs);
- if (CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) - { - ierr += MoLRegisterEvolvedGroup(group, rhs); - } - else - { - CCTK_WARN(0, "MoL function not aliased"); - ierr++; - } - /* ALL OTHER EVOLVED VARIABLES (rho_star,tau,mhd_st_x,mhd_st_y,mhd_st_z) */ group = CCTK_GroupIndex("IllinoisGRMHD::grmhd_conservatives"); rhs = CCTK_GroupIndex("IllinoisGRMHD::grmhd_conservatives_rhs"); + ierr += MoLRegisterEvolvedGroup(group, rhs);
- if (CCTK_IsFunctionAliased("MoLRegisterEvolvedGroup")) - { - ierr += MoLRegisterEvolvedGroup(group, rhs); - } - else - { - CCTK_WARN(0, "MoL function not aliased"); - ierr++; - } + if (ierr) CCTK_ERROR("Problems registering with MoL");
- if (ierr) CCTK_WARN(0,"Problems registering with MoL"); - }