Changeset 1314 for XIOS/dev/XIOS_DEV_CMIP6/src/generate_fortran_interface.cpp

Timestamp:

10/24/17 11:27:52 (7 years ago)

Author:

ymipsl

Message:

Add 2 new spatial transformations :

• reduce_scalar_to_scalar : global reduction between scalar
• duplicate_scalar_to_axis : a scalar value is duplicated on each level of the axis.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/generate_fortran_interface.cpp (modified) (7 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/generate_fortran_interface.cpp

@@ -47 +47 @@
   CExtractAxisToScalar extractAxisToScalar;
   CReduceDomainToScalar reduceDomainToScalar;
+  CDuplicateScalarToAxis duplicateScalarToAxis;
+  CReduceScalarToScalar reduceScalarToScalar;
   
   ostringstream oss;
@@ -344 +346 @@
   file.close();
  
-  file.open((path+"reduce_domain_to_axis_interface_attr.F90").c_str());
-  reduceDomainToAxis.generateFortran2003Interface(file);
-  file.close();
-
   file.open((path+"icreduce_domain_to_axis_attr.cpp").c_str());
   reduceDomainToAxis.generateCInterface(file);
@@ -360 +358 @@
   file.close();
  
-  file.open((path+"reduce_axis_to_axis_interface_attr.F90").c_str());
-  reduceAxisToAxis.generateFortran2003Interface(file);
-  file.close();
-
   file.open((path+"icreduce_axis_to_axis_attr.cpp").c_str());
   reduceAxisToAxis.generateCInterface(file);
@@ -376 +370 @@
   file.close();
 
+  file.open((path+"icextract_domain_to_axis_attr.cpp").c_str());
+  extractDomainToAxis.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iextract_domain_to_axis_attr.F90").c_str());
+  extractDomainToAxis.generateFortranInterface(file);
+  file.close();
+
+
   file.open((path+"temporal_splitting_interface_attr.F90").c_str());
   temporalSplitting.generateFortran2003Interface(file);
   file.close();
 
-  file.open((path+"icextract_domain_to_axis_attr.cpp").c_str());
-  extractDomainToAxis.generateCInterface(file);
-  file.close();
-
   file.open((path+"ictemporal_splitting_attr.cpp").c_str());
   temporalSplitting.generateCInterface(file);
   file.close();
 
-  file.open((path+"iextract_domain_to_axis_attr.F90").c_str());
-  extractDomainToAxis.generateFortranInterface(file);
-  file.close();
-
   file.open((path+"itemporal_splitting_attr.F90").c_str());
   temporalSplitting.generateFortranInterface(file);
@@ -397 +392 @@
 
 
+  file.open((path+"duplicate_scalar_to_axis_interface_attr.F90").c_str());
+  duplicateScalarToAxis.generateFortran2003Interface(file);
+  file.close();
+  
+  file.open((path+"icduplicate_scalar_to_axis_attr.cpp").c_str());
+  duplicateScalarToAxis.generateCInterface(file);
+  file.close();
+  
+  file.open((path+"iduplicate_scalar_to_axis_attr.F90").c_str());
+  duplicateScalarToAxis.generateFortranInterface(file);
+  file.close();
   /*!
     Scalar transformations
@@ -424 +430 @@
   file.close();
 
+
   file.open((path+"reduce_domain_to_scalar_interface_attr.F90").c_str());
   reduceDomainToScalar.generateFortran2003Interface(file);
   file.close();
 
-  file.open((path+"temporal_splitting_interface_attr.F90").c_str());
-  temporalSplitting.generateFortran2003Interface(file);
-  file.close();
-
   file.open((path+"icreduce_domain_to_scalar_attr.cpp").c_str());
   reduceDomainToScalar.generateCInterface(file);
@@ -440 +443 @@
   file.close();
 
+
+  file.open((path+"reduce_scalar_to_scalar_interface_attr.F90").c_str());
+  reduceScalarToScalar.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icreduce_scalar_to_scalar_attr.cpp").c_str());
+  reduceScalarToScalar.generateCInterface(file);
+  file.close();
+
+  file.open((path+"ireduce_scalar_to_scalar_attr.F90").c_str());
+  reduceScalarToScalar.generateFortranInterface(file);
+  file.close();
+
+
+
+
+
   file.open((path+"context_interface_attr.F90").c_str());
   context->generateFortran2003Interface(file);