Changeset 2203 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp

Timestamp:

08/20/21 14:38:23 (3 years ago)

Author:

ymipsl

Message:

New functionnality : domain, axis and scalar can now be retrieve with new syntax id :
ex. for domain :

id="domainId" : old syntax, working as before
id="fieldId::domainId" : get the domain related to "domainId" associated to the field "fieldId", work if only 1 domain related to domainId is associated to the field.
id="fieldId::domainId[n]" : get the nth domain related to "domainId" associated to the field "fieldId"
id="fieldId::" : get the domain associated the the field "fieldId, work if grid associated to th field is composed with exactly 1 domain (and possibly other components axis or scalars)
id="fieldId::[n] : get the nth domain composing the grid associated to the field

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp

@@ -13 +13 @@
 #include "client_server_mapping_distributed.hpp"
 #include "distribution_client.hpp"
+
+#include <algorithm>
+#include <regex>
 
 namespace xios {
@@ -217 +220 @@
    }
    CATCH
+
+   CAxis* CAxis::get(const string& id)
+   {
+     const regex r("::");
+     smatch m;
+     if (regex_search(id, m, r))
+     {
+        if (m.size()!=1) ERROR("CAxis* CAxis::get(string& id)", <<" id = "<<id<< "  -> bad format id, separator :: append more than one time");
+        string fieldId=m.prefix() ;
+        if (fieldId.empty()) ERROR("CAxis* CAxis::get(string& id)", <<" id = "<<id<< "  -> bad format id, field name is empty");
+        string suffix=m.suffix() ;
+        CField* field=CField::get(fieldId) ;
+        return field->getAssociatedAxis(suffix) ;
+     }
+     else return CObjectFactory::GetObject<CAxis>(id).get();
+   }
 
    /*!