Merge commit 'refs/pull/1/head' of https://github.com/UMR-CNRM/PHYEX

docs/Developer.md

@@ -40,7 +40,7 @@ Here is a short description of the different generic branches:
 
 The build systems are evolving.
 Until cycle 49t1 (included), the physics source code is directly included in the source code tree.
-After cycle 49t1, the physics source code (as well as other model parts such as ectrans, fiat...) will be available through a bundle component.
+After cycle 49t1, the physics source code (as well as other model parts such as ectrans, fiat...) will be available as a _component_ of a _bundle_.
 
 This evolution will impact the way to contribute to the PHYEX repository.
 
@@ -55,7 +55,7 @@ The workflow was chosen so that the developers would not have to change their wo
 
 ### Scientific contributions until cycle 49t1
 
-Who: developers with scientific contributions based on cycles 48t1, 48t2, 48t3 and 49t1
+Who: developers with scientific contributions based on cycles 48t1, 48t2, 48t3, 49 and 49t1 (as long as PHYEX is not a bundle component).
 
 Workflow summary: because the physics source code is still included in the IAL source code, pull requests concerning the physics continue to follow the same path as before (ie pull requests are submitted to the IAL repository). Afterwards, the IAL integrator will submit a pull request to the PHYEX repository with only the relevant files.
 
@@ -72,9 +72,9 @@ Workflow details (getting the source code in blue, pull request in red, integrat
 
 ### Refactoring contributions from now on, and scientific contributions after cycle 49t1
 
-Who: developers with scientific contributions based on cycles 49t2 and following; and developers with GPU-refactoring contributions.
+Who: developers with scientific contributions based on cycles 50 and following (as soon as PHYEX is a bundle component); and developers with GPU-refactoring contributions.
 
-Workflow summary: after the cycle 49t1 (starting from 49t2?), AROME and HARMONIE-AROME will become a bundle. Il will be built with source codes coming from various places. One of these places will be the PHYEX repository. Pull requests must be sent to each modified components of the bundle.
+Workflow summary: after the cycle 49t1 (probably starting from cycle 50), AROME and HARMONIE-AROME will become a bundle. Il will be built with source codes coming from various places. One of these places will be the PHYEX repository. Pull requests must be sent to each modified components of the bundle.
 
 Developer must use a model specific branch (arome\_\<commit\_hash\> when working with the model, or testprogs\_\<commit\_hash\> when working with the offline tools).
 These branches receive tags based on the master branch version. For example the commit, in the master branch, corresponding to the version 1.0.0 of PHYEX will receive the tag "v1.0.0".
@@ -89,14 +89,14 @@ Workflow details (getting the source code in blue, pull request in red, integrat
   - 4 and 5: AROME or HARMONIE-AROME developer sends pull requests to the different repositories where files have been modified
   - 6: The PHYEX administrator checks the pull requests in the other applications, the IAL integrator integrates on the arome specific branch; then the PHYEX administrator integrates the modifications in the master branch and, eventually, produce a new arome specific branch for future integration in IAL
 
-### Special notes for building the model from PHYEX before cycle 49t2
+### Special notes for building the AROME or HARMONIE-AROME model from PHYEX until cycle 49t1 included
 
 Because the interfaces between the physics and the rest of the model can change, one have to choose the right version of IAL to use with PHYEX.
 The file 'src/arome/ial\_version.json' contains a description of this IAL version.
 
 If no IAL version suits correctly, this json file is accompanied by the 'ext' directory and/or by the 'src/arome/gmkpack\_ignored\_files' file.
 
-To build the model, you must:
+To build the model from PHYEX, you must:
 
 - checkout the IAL source code using the version described in the file src/arome/ial\_version.json
 - remove the directories 'mpa/\*/internals' and 'mpa/\*/modules' (if they still exist in IAL, eg: 48t3)
@@ -104,6 +104,8 @@ To build the model, you must:
 - if the 'ext' directory exists, dispatch its content into the subdirectories of IAL
 - remove from the source tree the files listed in the 'src/arome/gmkpack\_ignored\_files' file
 
+However, for scientific contributions to 49t1, we suggest scientists to use the physics code present in IAL, rather than from PHYEX.
+
 ## Contribution workflow for MESO-NH developers
 
 The physics source code is embedded in the Méso-NH source code.