Add two-phase PCD petsc option files.

2d/numericalTanks/randomWaves/README.rst

@@ -12,7 +12,7 @@ Random waves typically consist of non-repeatable wave sequences, so each individ
 
 Random wave sequences are generated by descritising the spectral distribution into frequency components and composing free-surface and velocity field by superimposing the free-surface elevation and velocity of each individual component. The amplitude of these components is calculated by the spectral distribution. The phasing of each component is either randomly allocated to generate a truly random series or pre-defined in order to generate focused waves. More information on random waves can be found in Goda (2009) and Dean and Dalrymple (1991).
 
-In this case, the numerical flume described in https://github.com/erdc-cm/air-water-vv/tree/adimako/merge/2d/numericalTanks/linearWaves is used to demonstrate the capability of Proteus for generating random waves.
+In this case, the numerical flume described in https://github.com/erdc/air-water-vv/tree/adimako/merge/2d/numericalTanks/linearWaves is used to demonstrate the capability of Proteus for generating random waves.
 
 Tests
 -----

2d/numericalTanks/randomWavesFast/README.rst

@@ -3,7 +3,7 @@ Fast Random wave  generation
 
 Description
 ----------
-The test case setup is described in https://github.com/erdc-cm/air-water-vv/tree/adimako/merge/2d/numericalTanks/randomWaves.
+The test case setup is described in https://github.com/erdc/air-water-vv/tree/adimako/merge/2d/numericalTanks/randomWaves.
 In this particular case, the generation methodology is optimised to allow fast generation of long non repeating random waves sequences using processing with spectral windows. More details on the methodology can be found in Dimakopoulos et al. (2017).
 
 Tests (to be added)

2d/numericalTanks/standingWaves/README.rst

@@ -6,7 +6,7 @@ Description
 
 Standing waves are formed when regular waves interact with a fully reflective wall. In this case, a distinctive patterns emerges and the wave amplitude becomes a sinusioidal function in space. The reflected waves are fully synconised with the incident ones at an even number of half wavelenghts from the wall, whilst cancelling each other at an odd number of wavelength, this creating the distinctive wave patterns of nodes and antinodes, where the amplitude is double and zero, respectively.
 
-In this case, the numerical flume described in https://github.com/erdc-cm/air-water-vv/tree/adimako/merge/2d/numericalTanks/linearWaves is used to demonstrate the capability of Proteus of modelling standing wave patterns and in particular of absorbing the reflected waves at the generation / absorption zone.
+In this case, the numerical flume described in https://github.com/erdc/air-water-vv/tree/adimako/merge/2d/numericalTanks/linearWaves is used to demonstrate the capability of Proteus of modelling standing wave patterns and in particular of absorbing the reflected waves at the generation / absorption zone.
 
 Tests
 -----

README.rst

@@ -2,7 +2,7 @@
 Verification and validation for air/water flow models
 =====================================================
 
-https://github.com/erdc-cm/air-water-vv
+https://github.com/erdc/air-water-vv
 
 Organization of the test set
 ----------------------------
@@ -16,7 +16,7 @@ test consists of a single directory including
 - All data files describing the geometry and physical parameters of
   the problem
 - A set of input files for a code
-  (e.g. https://github.com/erdc-cm/proteus)
+  (e.g. https://github.com/erdc/proteus)
 - A script for results postprocessing (Optional)
 - A script for running regression tests
 

inputTemplates/petsc.options.schur.two_phase_pcd_1

@@ -0,0 +1,40 @@
+# use a Schur Complement for the first set of solves
+
+# set petsc ksp object and preconditioner
+
+-rans2p_ksp_type gmres
+-rans2p_ksp_gmres_modifiedgramschmidt
+-rans2p_ksp_gmres_restart 100
+-rans2p_ksp_pc_side right
+
+#-rans2p_ksp_atol 1e-20
+#-rans2p_ksp_rtol 1e-6
+#-ksp_view
+#-ksp_monitor_true_residual
+#-help
+#-log_summary
+
+# pc options
+-rans2p_pc_fieldsplit_type schur 
+-rans2p_pc_fieldsplit_schur_fact_type upper
+-rans2p_pc_fieldsplit_schur_precondition user
+
+# direct solver for velocity block - ksp options 
+-rans2p_fieldsplit_velocity_ksp_type preonly
+-rans2p_fieldsplit_velocity_pc_type lu
+-rans2p_fieldsplit_velocity_pc_factor_mat_solver_package superlu_dist
+
+# pressure block options
+-rans2p_fieldsplit_pressure_ksp_type preonly
+
+-innerTPPCDsolver_Qp_visc_ksp_type preonly
+-innerTPPCDsolver_Qp_visc_pc_type lu
+-innerTPPCDsolver_Qp_visc_pc_factor_mat_solver_package superlu_dist
+
+-innerTPPCDsolver_Qp_dens_ksp_type preonly
+-innerTPPCDsolver_Qp_dens_pc_type lu
+-innerTPPCDsolver_Qp_dens_pc_factor_mat_solver_package superlu_dist
+
+-innerTPPCDsolver_Ap_rho_ksp_type preonly
+-innerTPPCDsolver_Ap_rho_pc_type hypre
+-innerTPPCDsolver_Ap_rho_pc_hypre_type boomeramg

inputTemplates/petsc.options.schur.two_phase_pcd_2

@@ -0,0 +1,42 @@
+# use a Schur Complement for the first set of solves
+
+# set petsc ksp object and preconditioner
+
+-rans2p_ksp_type gmres
+-rans2p_ksp_gmres_modifiedgramschmidt
+-rans2p_ksp_gmres_restart 100
+-rans2p_ksp_pc_side right
+
+#-rans2p_ksp_atol 1e-20
+#-rans2p_ksp_rtol 1e-6
+#-ksp_view
+#-ksp_monitor_true_residual
+#-help
+#-log_summary
+
+# pc options
+-rans2p_pc_fieldsplit_type schur 
+-rans2p_pc_fieldsplit_schur_fact_type upper
+-rans2p_pc_fieldsplit_schur_precondition user
+
+# direct solver for velocity block - ksp options 
+-rans2p_fieldsplit_velocity_ksp_type gmres
+-rans2p_fieldsplit_velocity_ksp_pc_side right
+-rans2p_fieldsplit_velocity_pc_type hypre
+-rans2p_fieldsplit_velocity_pc_hypre_type boomeramg
+-rans2p_fieldsplit_velocity_pc_hypre_boomeramg_coarsen_type PMIS
+
+# pressure block options
+-rans2p_fieldsplit_pressure_ksp_type preonly
+
+-innerTPPCDsolver_Qp_visc_ksp_type preonly
+-innerTPPCDsolver_Qp_visc_pc_type lu
+-innerTPPCDsolver_Qp_visc_pc_factor_mat_solver_package superlu_dist
+
+-innerTPPCDsolver_Qp_dens_ksp_type preonly
+-innerTPPCDsolver_Qp_dens_pc_type lu
+-innerTPPCDsolver_Qp_dens_pc_factor_mat_solver_package superlu_dist
+
+-innerTPPCDsolver_Ap_rho_ksp_type preonly
+-innerTPPCDsolver_Ap_rho_pc_type hypre
+-innerTPPCDsolver_Ap_rho_pc_hypre_type boomeramg

private/proteus-mprans.yaml

@@ -4,7 +4,7 @@ dependencies:
   run: [proteus, numpy]
 
 sources:
-  - url: https://github.com/erdc-cm/proteus-mprans
+  - url: https://github.com/erdc/proteus-mprans
     key: git:fc5a90c2a50bb9716460876ad1ee91da598ff8f3
 
 profile_links: