Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1982

Timestamp:

11/24/20 18:55:35 (4 years ago)

Author:

yushan

Message:

trunk : workflow graph big fixed for chained spatial filters. Filter name simplified for graph

Location:

XIOS/trunk/src

Files:

: 25 edited

filter/spatial_transform_filter.cpp (modified) (2 diffs)
transformation/axis_algorithm_duplicate_scalar.hpp (modified) (1 diff)
transformation/axis_algorithm_extract.hpp (modified) (1 diff)
transformation/axis_algorithm_extract_domain.hpp (modified) (1 diff)
transformation/axis_algorithm_interpolate.hpp (modified) (1 diff)
transformation/axis_algorithm_inverse.hpp (modified) (1 diff)
transformation/axis_algorithm_reduce_axis.hpp (modified) (1 diff)
transformation/axis_algorithm_reduce_domain.hpp (modified) (1 diff)
transformation/axis_algorithm_temporal_splitting.hpp (modified) (1 diff)
transformation/axis_algorithm_transformation.hpp (modified) (1 diff)
transformation/axis_algorithm_zoom.hpp (modified) (1 diff)
transformation/domain_algorithm_compute_connectivity.hpp (modified) (1 diff)
transformation/domain_algorithm_expand.hpp (modified) (1 diff)
transformation/domain_algorithm_extract.hpp (modified) (1 diff)
transformation/domain_algorithm_generate_rectilinear.hpp (modified) (1 diff)
transformation/domain_algorithm_interpolate.hpp (modified) (1 diff)
transformation/domain_algorithm_reorder.hpp (modified) (1 diff)
transformation/domain_algorithm_transformation.hpp (modified) (1 diff)
transformation/domain_algorithm_zoom.hpp (modified) (1 diff)
transformation/generic_algorithm_transformation.hpp (modified) (1 diff)
transformation/scalar_algorithm_extract_axis.hpp (modified) (1 diff)
transformation/scalar_algorithm_reduce_axis.hpp (modified) (1 diff)
transformation/scalar_algorithm_reduce_domain.hpp (modified) (1 diff)
transformation/scalar_algorithm_reduce_scalar.hpp (modified) (1 diff)
transformation/scalar_algorithm_transformation.hpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

XIOS/trunk/src/filter/spatial_transform_filter.cpp

-                      r1704
+                      r1982
       currentBuff = 0;
       bool firstPass=true;
+      if(filterID >=0) // building_graph
+      {
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[filterID].filter_name += ("\\n"+(*itAlgo)->getName());
+      }
       for (itRecv = itbRecv; itRecv != iteRecv; ++itRecv)
+      {
 …
         int srcRank = itRecv->first;
+        if(filterID >=0) // building_graph
+        {
+           (*CWorkflowGraph::mapFilters_ptr_with_info)[filterID].filter_name = (*itAlgo)->getName();
+        }
         if (srcRank != rank)
+        {

XIOS/trunk/src/transformation/axis_algorithm_duplicate_scalar.hpp

r1704	r1982
33	33	static bool registerTrans();
34	34
35		virtual StdString getName() {return "~~Axis Trans. Filter \\n Duplicate S~~calar";}
	35	virtual StdString getName() {return "duplicate_scalar";}
36	36
37	37	protected:

XIOS/trunk/src/transformation/axis_algorithm_extract.hpp

-                      r1704
+                      r1982
   static bool registerTrans();
   virtual StdString getName() {return "Axis Trans. Filter \\n Extract";}
+  virtual StdString getName() {return "extract_axis";}
 protected:
   void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);

XIOS/trunk/src/transformation/axis_algorithm_extract_domain.hpp

r1704	r1982
40	40	static bool registerTrans();
41	41
42		virtual StdString getName() {return "~~Axis Trans. Filter \\n Extract D~~omain";}
	42	virtual StdString getName() {return "extract_domain";}
43	43
44	44	protected:

XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp

r1980	r1982
33	33	static bool registerTrans();
34	34
35		virtual StdString getName() {return "~~Axis Trans. Filter \\n Interpolation~~";}
	35	virtual StdString getName() {return "interpolate_axis";}
36	36	bool isInversed() {return isInversed_;}
37	37

XIOS/trunk/src/transformation/axis_algorithm_inverse.hpp

r1704	r1982
31	31	static bool registerTrans();
32	32
33		virtual StdString getName() {return "~~Axis Trans. Filter \\n Inverse~~";}
	33	virtual StdString getName() {return "inverse_axis";}
34	34
35	35	protected:

XIOS/trunk/src/transformation/axis_algorithm_reduce_axis.hpp

r1704	r1982
40	40	static bool registerTrans();
41	41
42		virtual StdString getName() {return "~~Axis Trans. Filter \\n Reduce A~~xis";}
	42	virtual StdString getName() {return "reduce_axis";}
43	43	protected:
44	44

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.hpp

r1704	r1982
41	41	static bool registerTrans();
42	42
43		virtual StdString getName() {return "~~Axis Trans. Filter \\n Reduce D~~omain";}
	43	virtual StdString getName() {return "reduce_domain";}
44	44
45	45	protected:

XIOS/trunk/src/transformation/axis_algorithm_temporal_splitting.hpp

r1704	r1982
34	34	static bool registerTrans();
35	35
36		virtual StdString getName() {return "~~Axis Trans. Filter \\n Temporal S~~plitting";}
	36	virtual StdString getName() {return "temporal_splitting";}
37	37
38	38	protected:

XIOS/trunk/src/transformation/axis_algorithm_transformation.hpp

r1704	r1982
31	31	virtual ~CAxisAlgorithmTransformation();
32	32
33		virtual StdString getName() {return "Axis Trans~~. Filter \\n Trans~~formation";}
	33	virtual StdString getName() {return "Axis Transformation";}
34	34
35	35	protected:

XIOS/trunk/src/transformation/axis_algorithm_zoom.hpp

r1704	r1982
28	28	static bool registerTrans();
29	29
30		virtual StdString getName() {return "~~Axis Trans. Filter \\n Zoom~~";}
	30	virtual StdString getName() {return "zoom_axis";}
31	31
32	32	protected:

XIOS/trunk/src/transformation/domain_algorithm_compute_connectivity.hpp

r1704	r1982
29	29	static bool registerTrans();
30	30
31		virtual StdString getName() {return "~~Domain Trans. Filter \\n Compute Connectivity~~";}
	31	virtual StdString getName() {return "compute_connectivity_domain";}
32	32
33	33	protected:

XIOS/trunk/src/transformation/domain_algorithm_expand.hpp

r1704	r1982
29	29	static bool registerTrans();
30	30
31		virtual StdString getName() {return "~~Domain Trans. Filter \\n Expand~~";}
	31	virtual StdString getName() {return "expand_domain";}
32	32
33	33	protected:

XIOS/trunk/src/transformation/domain_algorithm_extract.hpp

r1704	r1982
24	24	static bool registerTrans();
25	25
26		virtual StdString getName() {return "~~Domain Trans. Filter \\n Extract~~";}
	26	virtual StdString getName() {return "extract_domain";}
27	27	protected:
28	28	void updateDomainAttributes();

XIOS/trunk/src/transformation/domain_algorithm_generate_rectilinear.hpp

r1704	r1982
33	33	virtual ~CDomainAlgorithmGenerateRectilinear() {}
34	34
35		virtual StdString getName() {return "~~Domain Trans. Filter \\n Generate Rectilinear~~";}
	35	virtual StdString getName() {return "generate_rectilinear_domain";}
36	36
37	37	protected:

XIOS/trunk/src/transformation/domain_algorithm_interpolate.hpp

r1704	r1982
40	40	static bool registerTrans();
41	41
42		virtual StdString getName() {return "~~Domain Trans. Filter \\n Interpolatio~~n";}
	42	virtual StdString getName() {return "interpolate_domain";}
43	43
44	44	protected:

XIOS/trunk/src/transformation/domain_algorithm_reorder.hpp

r1704	r1982
26	26	static bool registerTrans();
27	27
28		virtual StdString getName() {return "~~Domain Trans. Filter \\n Reorder~~";}
	28	virtual StdString getName() {return "reorder_domain";}
29	29
30	30	protected:

XIOS/trunk/src/transformation/domain_algorithm_transformation.hpp

r1704	r1982
27	27	virtual ~CDomainAlgorithmTransformation();
28	28
29		virtual StdString getName() {return "Domain Trans~~. Filter \\n Trans~~formation";}
	29	virtual StdString getName() {return "Domain Transformation";}
30	30
31	31	protected:

XIOS/trunk/src/transformation/domain_algorithm_zoom.hpp

r1704	r1982
24	24	static bool registerTrans();
25	25
26		virtual StdString getName() {return "~~Domain Trans. Filter \\n Zoom~~";}
	26	virtual StdString getName() {return "zoom_domain";}
27	27	protected:
28	28	void updateDomainAttributes();

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

r1704	r1982
74	74	bool ignoreMissingValue, bool firstPass);
75	75
76		virtual StdString getName() {return "Generic Trans~~. Filter~~";}
	76	virtual StdString getName() {return "Generic Transformation";}
77	77
78	78	/*!

XIOS/trunk/src/transformation/scalar_algorithm_extract_axis.hpp

r1704	r1982
39	39	static bool registerTrans();
40	40
41		virtual StdString getName() {return "~~Scalar Trans. Filter \\n Extract A~~xis";}
	41	virtual StdString getName() {return "extract_axis";}
42	42
43	43	protected:

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.hpp

r1704	r1982
41	41	static bool registerTrans();
42	42
43		virtual StdString getName() {return "~~Scalar Trans. Filter \\n Reduce A~~xis";}
	43	virtual StdString getName() {return "reduce_axis";}
44	44
45	45	protected:

XIOS/trunk/src/transformation/scalar_algorithm_reduce_domain.hpp

r1704	r1982
41	41	static bool registerTrans();
42	42
43		virtual StdString getName() {return "~~Scalar Trans. Filter \\n Reduce D~~omain";}
	43	virtual StdString getName() {return "reduce_domain";}
44	44
45	45	protected:

XIOS/trunk/src/transformation/scalar_algorithm_reduce_scalar.hpp

r1704	r1982
36	36	static bool registerTrans();
37	37
38		virtual StdString getName() {return "~~Scalar Trans. Filter \\n Reduce S~~calar";}
	38	virtual StdString getName() {return "reduce_scalar";}
39	39
40	40	protected:

XIOS/trunk/src/transformation/scalar_algorithm_transformation.hpp

r1704	r1982
31	31	virtual ~CScalarAlgorithmTransformation();
32	32
33		virtual StdString getName() {return "Scalar Trans~~. Filter \\n Trans~~formation";}
	33	virtual StdString getName() {return "Scalar Transformation";}
34	34
35	35	protected:

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 1982

Legend:

Download in other formats: