diff --git a/ncar_scripts/TDRP/beltramiTR.tdrp b/ncar_scripts/TDRP/beltramiTR.tdrp index aa4d238..fa5763c 100644 --- a/ncar_scripts/TDRP/beltramiTR.tdrp +++ b/ncar_scripts/TDRP/beltramiTR.tdrp @@ -1237,7 +1237,7 @@ k_max_wavenumber = { -1, -1 }; //====================================================================== // -// VARIABLES NEEDED BY THERMO +// VARIABLES NEEDED BY THERMO. // //====================================================================== @@ -1245,106 +1245,106 @@ k_max_wavenumber = { -1, -1 }; // // Type: int -i_pip_bcL = 0; +i_pip_bcL = -1; ///////////// i_pip_bcR /////////////////////////////// // // Type: int -i_pip_bcR = 0; +i_pip_bcR = -1; ///////////// i_thetarhop_bcL /////////////////////////////// // // Type: int -i_thetarhop_bcL = 0; +i_thetarhop_bcL = -1; ///////////// i_thetarhop_bcR /////////////////////////////// // // Type: int -i_thetarhop_bcR = 0; +i_thetarhop_bcR = -1; ///////////// i_ftheta_bcL /////////////////////////////// // // Type: int -i_ftheta_bcL = 0; +i_ftheta_bcL = -1; ///////////// i_ftheta_bcR /////////////////////////////// // // Type: int -i_ftheta_bcR = 0; +i_ftheta_bcR = -1; ///////////// j_pip_bcL /////////////////////////////// // // Type: int -j_pip_bcL = 0; +j_pip_bcL = -1; ///////////// j_pip_bcR /////////////////////////////// // // Type: int -j_pip_bcR = 0; +j_pip_bcR = -1; ///////////// j_thetarhop_bcL /////////////////////////////// // // Type: int -j_thetarhop_bcL = 0; +j_thetarhop_bcL = -1; ///////////// j_thetarhop_bcR /////////////////////////////// // // Type: int -j_thetarhop_bcR = 0; +j_thetarhop_bcR = -1; ///////////// j_ftheta_bcL /////////////////////////////// // // Type: int -j_ftheta_bcL = 0; +j_ftheta_bcL = -1; ///////////// j_ftheta_bcR /////////////////////////////// // // Type: int -j_ftheta_bcR = 0; +j_ftheta_bcR = -1; ///////////// k_pip_bcL /////////////////////////////// // // Type: int -k_pip_bcL = 0; +k_pip_bcL = -1; ///////////// k_pip_bcR /////////////////////////////// // // Type: int -k_pip_bcR = 0; +k_pip_bcR = -1; ///////////// k_thetarhop_bcL /////////////////////////////// // // Type: int -k_thetarhop_bcL = 0; +k_thetarhop_bcL = -1; ///////////// k_thetarhop_bcR /////////////////////////////// // // Type: int -k_thetarhop_bcR = 0; +k_thetarhop_bcR = -1; ///////////// k_ftheta_bcL /////////////////////////////// // // Type: int -k_ftheta_bcL = 0; +k_ftheta_bcL = -1; ///////////// k_ftheta_bcR /////////////////////////////// // // Type: int -k_ftheta_bcR = 0; \ No newline at end of file +k_ftheta_bcR = -1; \ No newline at end of file diff --git a/src/Params.cc b/src/Params.cc index cc18e11..6e6f1ff 100644 --- a/src/Params.cc +++ b/src/Params.cc @@ -3209,7 +3209,7 @@ tt->val_offset = (char *) &k_ftheta_bcR - &_start_; tt->single_val.i = -999; tt++; - + // trailing entry has param_name set to NULL tt->param_name = NULL; diff --git a/src/Params.hh b/src/Params.hh index 33c6f14..14a725f 100644 --- a/src/Params.hh +++ b/src/Params.hh @@ -799,7 +799,7 @@ private: void _init(); - mutable TDRPtable _table[191]; + mutable TDRPtable _table[210]; const char *_className; diff --git a/src/VarDriver3D.cpp b/src/VarDriver3D.cpp index 4096417..d8912e7 100644 --- a/src/VarDriver3D.cpp +++ b/src/VarDriver3D.cpp @@ -103,7 +103,11 @@ bool VarDriver3D::validateDriver() // Print the analysis_type from the TDRP config file std::cout << "Analysis type: " << configHash["analysis_type"] << std::endl; - if(configHash["analysis_type"] != "WIND") { + if(configHash["analysis_type"] != "WIND") + { + std::cout << "i_pip_bcL = " << configHash["i_pip_bcL"] << std::endl; + std::cout << "j_pip_bcR = " << configHash["j_pip_bcR"] << std::endl; + std::cout << "k_ftheta_bcL = " << configHash["k_ftheta_bcL"] << std::endl; std::cout << "Currently unsupported Analysis type: " << configHash["analysis_type"] << ", Aborting..." << std::endl; return false; }