From 8d3d203c62b92b332e0c4a4481f343d4ac7033e6 Mon Sep 17 00:00:00 2001 From: marqh Date: Mon, 8 Apr 2024 14:56:44 +0000 Subject: [PATCH 1/3] update patch for r2628 --- patches/xios3/revert_svn2517_transport.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/xios3/revert_svn2517_transport.patch b/patches/xios3/revert_svn2517_transport.patch index 3f4dd79..0976052 100644 --- a/patches/xios3/revert_svn2517_transport.patch +++ b/patches/xios3/revert_svn2517_transport.patch @@ -213,11 +213,11 @@ Index: src/manager/ressources_manager.cpp @@ -135,7 +139,7 @@ winNotify_->popFromLockedWindow(commRank, this, &CRessourcesManager::notificationsDumpIn) ; - CTimer::get("CRessourcesManager::checkNotifications pop").suspend(); - CTimer::get("CRessourcesManager::checkNotifications unlock").resume(); + if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications pop").suspend(); + if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications unlock").resume(); - winNotify_->unlockWindowExclusive(commRank) ; + winNotify_->unlockWindow(commRank) ; - CTimer::get("CRessourcesManager::checkNotifications unlock").suspend(); + if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications unlock").suspend(); if (notifyType_==NOTIFY_CREATE_POOL) createPool() ; else if (notifyType_==NOTIFY_FINALIZE) finalizeSignal() ; @@ -192,46 +196,48 @@ From e3507a51f34ef1a72843b2a6d805b2f3d67e766a Mon Sep 17 00:00:00 2001 From: Samantha Adams Date: Mon, 25 Mar 2024 11:16:27 +0000 Subject: [PATCH 2/3] Adding short README files for each XIOS example --- xios_examples/read_axis_resample/README | 4 ++++ xios_examples/read_domain_resample/README | 4 ++++ xios_examples/vertical_stratify_pressure/README | 4 ++++ xios_examples/vertical_stratify_scenarios/README | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 xios_examples/read_axis_resample/README create mode 100644 xios_examples/read_domain_resample/README create mode 100644 xios_examples/vertical_stratify_pressure/README create mode 100644 xios_examples/vertical_stratify_scenarios/README diff --git a/xios_examples/read_axis_resample/README b/xios_examples/read_axis_resample/README new file mode 100644 index 0000000..00b587c --- /dev/null +++ b/xios_examples/read_axis_resample/README @@ -0,0 +1,4 @@ +read_axis_resample +------------------ + +This example reads in a sample NetCDF file of arbitrary data of 10 values on the z axis and interpolates to 4 new z axis values using polynomial order 2. Known good values for interpolated data are included in the input file for comparison. The original and resampled data are written to one output NetCDF file. The unit tests include one known failure test case where the expected result is not produced. diff --git a/xios_examples/read_domain_resample/README b/xios_examples/read_domain_resample/README new file mode 100644 index 0000000..d5da433 --- /dev/null +++ b/xios_examples/read_domain_resample/README @@ -0,0 +1,4 @@ +read_domain_resample +-------------------- + +This example reads in a sample NetCDF file of arbitrary data on a 5 x 5 rectilinear (structured) horizontal domain and resamples to a 4 x 4 rectilinear horizontal domain using bilinear interpolation. The original and resampled data as well as a diff between them are written to one output NetCDF file. The unit tests include two known failure test cases where the expected result is not produced. diff --git a/xios_examples/vertical_stratify_pressure/README b/xios_examples/vertical_stratify_pressure/README new file mode 100644 index 0000000..3b48f4f --- /dev/null +++ b/xios_examples/vertical_stratify_pressure/README @@ -0,0 +1,4 @@ +vertical_stratify_pressure +-------------------------- + +This example demonstrates XIOS vertical interpolation for the specific case of interpolating data held on model levels to pressure levels. It takes a canned dataset of temperature and pressure on 39 model levels at one lat-lon point and interpolates temperature to 5 pressure levels using polynomial order 1. The original model level pressure and temperature data as well as the interpolated temperature data are written out to one netCDF file. diff --git a/xios_examples/vertical_stratify_scenarios/README b/xios_examples/vertical_stratify_scenarios/README new file mode 100644 index 0000000..1acf2fe --- /dev/null +++ b/xios_examples/vertical_stratify_scenarios/README @@ -0,0 +1,4 @@ +vertical_stratify_scenarios +--------------------------- + +This example reads in a sample NetCDF file consisting of a horizontal domain with one lat-lon point with temperature and pressure on 39 model levels. It interpolates temperature to 5 pressure levels using polynomial order 1. The original model level pressure and temperature data as well as the interpolated temperature data are written out to one netCDF file. From 9df1e6c794010b8f379ced23cd0258a9423a41dc Mon Sep 17 00:00:00 2001 From: mo-marqh <87382490+mo-marqh@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:16:30 +0000 Subject: [PATCH 3/3] minor reword (review) --- xios_examples/read_domain_resample/README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xios_examples/read_domain_resample/README b/xios_examples/read_domain_resample/README index d5da433..3f0abae 100644 --- a/xios_examples/read_domain_resample/README +++ b/xios_examples/read_domain_resample/README @@ -1,4 +1,5 @@ read_domain_resample -------------------- -This example reads in a sample NetCDF file of arbitrary data on a 5 x 5 rectilinear (structured) horizontal domain and resamples to a 4 x 4 rectilinear horizontal domain using bilinear interpolation. The original and resampled data as well as a diff between them are written to one output NetCDF file. The unit tests include two known failure test cases where the expected result is not produced. +These examples read in arbitrary data from a netCDF file and resample to a different horizontal domain as defined within the input netCDF file using bilinear interpolation. +The original and resampled data as well as a diff between them are written to one output NetCDF file. The unit tests include two known failure test cases where the expected result is not produced.