Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup and clarify wrfinput read #2200

Merged
merged 4 commits into from
Mar 19, 2025
Merged

Cleanup and clarify wrfinput read #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9f91c9
Add some clarifying comments
ewquon Mar 17, 2025
e735c96
Cleanup mapfac read from wrfinput
ewquon Mar 17, 2025
a3d9c10
Merge branch 'development' into cleanup_wrfinp
ewquon Mar 17, 2025
adc46e3
Merge branch 'development' into cleanup_wrfinp
AMLattanzi Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Source/IO/ERF_NCWpsFile.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ fill_fab_from_arrays (int iv,
NC_Data_Dims_Type& NC_dim_type,
FAB& temp)
{
int ns1, ns2, ns3;
int ns1, ns2, ns3; // bottom_top, south_north, west_east (these can be staggered or unstaggered)
if (NC_dim_type == NC_Data_Dims_Type::Time_BT) {
ns1 = nc_arrays[iv].get_vshape()[1];
ns2 = 1;
Expand All @@ -294,15 +294,14 @@ fill_fab_from_arrays (int iv,

if (var_name == "PH" || var_name == "PHB") {
my_box.setType(amrex::IndexType(amrex::IntVect(0,0,1)));
} else if (var_name == "U" || var_name == "UU" ||
var_name == "MAPFAC_U" || var_name == "MAPFAC_UY")
{
}
else if (var_name == "U" || var_name == "UU" || var_name == "MAPFAC_U") {
my_box.setType(amrex::IndexType(amrex::IntVect(1,0,0)));
} else if (var_name == "V" || var_name == "VV" ||
var_name == "MAPFAC_V" || var_name == "MAPFAC_VY")
{
}
else if (var_name == "V" || var_name == "VV" || var_name == "MAPFAC_V") {
my_box.setType(amrex::IndexType(amrex::IntVect(0,1,0)));
} else if (var_name == "W" || var_name == "WW") {
}
else if (var_name == "W" || var_name == "WW") {
my_box.setType(amrex::IndexType(amrex::IntVect(0,0,1)));
}

Expand Down
8 changes: 5 additions & 3 deletions Source/IO/ERF_ReadFromWRFInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ read_from_wrfinput (int lev,
NC_name == "THM" || NC_name == "PH" || NC_name == "PHB" || NC_name == "PB" || NC_name == "P" ||
NC_name == "QVAPOR" || NC_name == "QCLOUD" || NC_name == "QRAIN")
{
// Note: staggering is handled in `fill_fab_from_arrays`
NC_dim_types.push_back(NC_Data_Dims_Type::Time_BT_SN_WE);
}
else if (NC_name == "MAPFAC_UY" || NC_name == "MAPFAC_VY" || NC_name == "MAPFAC_MY" ||
NC_name == "MUB" || NC_name == "SST" || NC_name == "LANDMASK" ||
NC_name == "XLAT_V" || NC_name == "XLONG_U")
else if (NC_name == "MAPFAC_U" || NC_name == "MAPFAC_V" || NC_name == "MAPFAC_M" ||
NC_name == "MUB" || NC_name == "SST" || NC_name == "LANDMASK" ||
NC_name == "XLAT_V" || NC_name == "XLONG_U")
{
// Note: staggering is handled in `fill_fab_from_arrays`
NC_dim_types.push_back(NC_Data_Dims_Type::Time_SN_WE);
}
else if (NC_name == "C1H" || NC_name == "C2H")
Expand Down
12 changes: 6 additions & 6 deletions Source/Initialization/ERF_InitFromWRFInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ ERF::init_from_wrfinput (int lev)
NC_names.push_back("PB"); // 8
NC_names.push_back("P"); // 9
NC_names.push_back("MUB"); // 10
NC_names.push_back("MAPFAC_UY"); // 11
NC_names.push_back("MAPFAC_VY"); // 12
NC_names.push_back("MAPFAC_MY"); // 13
NC_names.push_back("MAPFAC_U"); // 11
NC_names.push_back("MAPFAC_V"); // 12
NC_names.push_back("MAPFAC_M"); // 13
NC_names.push_back("SST"); // 14
NC_names.push_back("LANDMASK"); // 15
NC_names.push_back("C1H"); // 16
Expand Down Expand Up @@ -433,7 +433,7 @@ ERF::init_from_wrfinput (int lev)
}

// Initialize MapFac U
if ( var_name == "MAPFAC_UY" ) {
if ( var_name == "MAPFAC_U" ) {
#ifdef _OPENMP
#pragma omp parallel if (amrex::Gpu::notInLaunchRegion())
#endif
Expand All @@ -446,7 +446,7 @@ ERF::init_from_wrfinput (int lev)
}

// Initialize MapFac V
if ( var_name == "MAPFAC_VY" ) {
if ( var_name == "MAPFAC_V" ) {
#ifdef _OPENMP
#pragma omp parallel if (amrex::Gpu::notInLaunchRegion())
#endif
Expand All @@ -459,7 +459,7 @@ ERF::init_from_wrfinput (int lev)
}

// Initialize MapFac M
if ( var_name == "MAPFAC_MY" ) {
if ( var_name == "MAPFAC_M" ) {
#ifdef _OPENMP
#pragma omp parallel if (amrex::Gpu::notInLaunchRegion())
#endif
Expand Down
Loading