Merge branch 'MFlowCode:master' into source

Author: mrodrig6

docs/documentation/case.md

@@ -509,7 +509,7 @@ If `file_per_process` is true, then pre_process, simulation, and post_process mu
 | `acoustic_source`                     | Logical | Acoustic source module activation |
 | `num_source`                          | Integer | Number of acoustic sources |
 | `acoustic(i)%%support`                | Integer | Geometry of spatial support for the acoustic source |
-| `acoustic(i)%%dipole`                 | Logical | Dipole source activation (optional; default = false for monopole) |
+| `acoustic(i)%%dipole`                 | Logical | Dipole source activation (optional; default = false -> monopole) |
 | `acoustic(i)%%loc(j)`                 | Real    | $j$-th coordinate of the point that defines the acoustic source location |
 | `acoustic(i)%%pulse`                  | Integer | Acoustic wave form: [1] Sine [2] Gaussian [3] Square |
 | `acoustic(i)%%npulse`                 | Real    | Number of pulse cycles |
@@ -525,7 +525,7 @@ If `file_per_process` is true, then pre_process, simulation, and post_process mu
 | `acoustic(i)%%foc_length`             | Real    | Transducer - Focal length of the transducer |
 | `acoustic(i)%%aperture`               | Real    | Transducer - Aperture of the transducer |
 | `acoustic(i)%%num_elements`           | Integer | Transducer array - Number of transducer elements in a transducer array |
-| `acoustic(i)%%element_on`             | Integer | Transducer array - Element number that is on (optional; default = 0 for all elements) |
+| `acoustic(i)%%element_on`             | Integer | Transducer array - Element number that is on (optional; default = 0 -> all elements) |
 | `acoustic(i)%%element_spacing_angle`  | Real    | 2D Transducer array - Spacing angle (in rad) between adjacent transducer elements |
 | `acoustic(i)%%element_polygon_ratio`  | Real    | 3D Transducer array - Ratio of polygon side length to transducer element radius |
 | `acoustic(i)%%rotate_angle`           | Real    | 3D Transducer array - Rotation angle of the transducer array (optional; default = 0) |
@@ -809,7 +809,7 @@ Each patch requires a different set of parameters, which are also listed in this
 |  7   | Spherical Transducer         | 3D        | #5 requirements and `%%loc(3)`                                                          |
 |  9   | Arcuate Transducer Array     | 2D        | #5 requirements, `%%num_elements`, `%%element_on`, `%%element_spacing_angle`            |
 | 10   | Annular Transducer Array     | 2D-Axisym | #9 requirements                                                                         |
-| 11   | Circular Transducer Array    | 3D        | #7 requirements, `%%element_polygon_ratio`, and `%%rotate_angle`(optional; default = 0) |
+| 11   | Circular Transducer Array    | 3D        | #7 requirements, `%%element_polygon_ratio`, and `%%rotate_angle`                        |
 
 Details of the required parameters for each acoustic support type are listed in [Acoustic Source](#acoustic-source).
 The acoustic support number (`#`) corresponds to the acoustic support type `Acoustic(i)%%support`, where $i$ is the acoustic source index.

docs/documentation/getting-started.md

@@ -23,7 +23,6 @@ Please select your desired configuration from the list bellow:
 . ./mfc.sh load
 ```
 
-<a id="via-aptitude"></a>
 - **Via [Aptitude](https://wiki.debian.org/Aptitude):**
 
 ```shell
@@ -77,7 +76,7 @@ Useful software to install for using WSL on Windows:
 - [Windows Terminal](https://apps.microsoft.com/store/detail/windows-terminal/9N0DX20HK701)
 - [Visual Studio Code](https://code.visualstudio.com/) and the [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension
 
-Once you have WSL installed, you can follow the instructions for *nix systems above (for Ubuntu, see [Via Aptitude](#via-aptitude)).
+Once you have WSL installed, you can follow the instructions for *nix systems above (for Ubuntu, see `Via Aptitude` section).
 
   </details>
 

src/common/include/macros.fpp

@@ -115,5 +115,30 @@
 #endif
 #:enddef
 
+#:def ACC_SETUP_source_spatials(*args)
+#ifdef CRAY_ACC_WAR
+    block
+
+        @:LOG({'@:ACC_SETUP_source_spatials(${', '.join(args)}$)'})
+
+        #:for arg in args
+            !$acc enter data copyin(${arg}$)
+            if (allocated(${arg}$%coord)) then
+                !$acc enter data create(${arg}$%coord)
+            end if
+            if (allocated(${arg}$%val)) then
+                !$acc enter data create(${arg}$%val)
+            end if
+            if (allocated(${arg}$%angle)) then
+                !$acc enter data create(${arg}$%angle)
+            end if
+            if (allocated(${arg}$%xyz_to_r_ratios)) then
+                !$acc enter data create(${arg}$%xyz_to_r_ratios)
+            end if
+        #:endfor
+    end block
+#endif
+#:enddef
+
 #define t_vec3   real(kind(0d0)), dimension(1:3)
 #define t_mat4x4 real(kind(0d0)), dimension(1:4,1:4)

src/common/m_derived_types.fpp

@@ -279,6 +279,14 @@ module m_derived_types
         integer :: element_on !< Element in the acoustic array to turn on
     end type acoustic_parameters
 
+    !> Acoustic source source_spatial pre-calculated values
+    type source_spatial_type
+        integer, dimension(:, :), allocatable :: coord !< List of grid points indices with non-zero source_spatial values
+        real(kind(0d0)), dimension(:), allocatable :: val !< List of non-zero source_spatial values
+        real(kind(0d0)), dimension(:), allocatable :: angle !< List of angles with x-axis for mom source term vector
+        real(kind(0d0)), dimension(:, :), allocatable :: xyz_to_r_ratios !< List of [xyz]/r for mom source term vector
+    end type source_spatial_type
+
     !> Ghost Point for Immersed Boundaries
     type ghost_point