parflow-pdaf vs. parflow-master#13
Draft
kvrigor wants to merge 26 commits into
Draft
Conversation
usage of communicator `dacomm` instead of `MPI_COMM_WORLD`
Add Vector: - PhaseRelPermGetAlpha - PhaseRelPermGetN Add PFModule - SaturationGetAlpha - SaturationGetN - GetPhaseRelPerm - GetSaturation Add function - PseudoAdvanceRichards Change time step control in `solver_richards.f90` If environment variable `FOR2131` is defined: - do a vector update of saturations in `solver_richards.f90:1718-1752`
General idea: Removal of environment variable FOR2131 in TSMP-PDAF
``` eTSMP/parflow/pfsimulator/parflow_lib/problem_saturation.c(668): error parflow#120: return value type does not match the function type return (dummy1 -> alpha_values); ^ eTSMP/parflow/pfsimulator/parflow_lib/problem_saturation.c(682): error parflow#120: return value type does not match the function type return (dummy1 -> n_values); ^ ```
``` eTSMP/parflow/pfsimulator/parflow_lib/solver_richards.c(4112): error parflow#303: explicit type is missing ("int" assumed) PseudoAdvanceRichards(PFModule * this_module, double start_time, /* Starting time */ ^ eTSMP/parflow/pfsimulator/parflow_lib/solver_richards.c(4112): error parflow#147: declaration is incompatible with "void PseudoAdvanceRichards(PFModule *, double, double, PFModule *, Vector *, Vector **, Vector **, Vector **)" (declared at line 1169 of "/p/scratch/cjibg36/jibg3683/DATAASSIMILATION/TSMP-PDAF/eTSMP/parflow/pfsimulator/parflow_lib/parflow_proto.h") PseudoAdvanceRichards(PFModule * this_module, double start_time, /* Starting time */ ^ ```
``` $TSMP/models/parflow_pdaf/pfsimulator/parflow_lib/solver_richards.c:1715:15: error: redefinition of 'filename' char filename[2048]; ```
```
$TSMP/models/parflow_pdaf/pfsimulator/parflow_lib/solver_richards.c:1821:12: error: variable 'dx' set but not used [-Werror,-Wunused-but-set-variable]
double dx, dy;
^
```
Error:
```
$TSMP/bin/JUWELS_ParFlow-CLM3.5-PDAF/include/parflow/parflow.h:69:10: fatal error: 'reservoir.h' file not found
^~~~~~~~~~~~~
```
Error: ``` parflow_pdaf/pfsimulator/parflow_lib/solver_richards.c:1817:16: error: unused variable ‘pfl_start’ [-Werror=unused-variable] ``` Background: For PDAF, the subgrid-loops, where these variables are originally used is commented out. However, up-to-now the (for PDAF) unused variable were still declared.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Not meant to be merged. This PR is only for tracking diffs between Parflow upstream.