[GCC] PAD: Implementação nova versão do GF - Integração MONAN

[joaomas]

:people_holding_hands: User Story

COMO (...) QUEREMOS (...) PARA (...)

:clipboard: Critérios de aceite de conclusão da Issue

• [x] Gerar a release 1.0.0 (MONAN).
• [x] Testar Release no TC dev (aguardar rodada).
• [x] Atualizar History (README).
• [x] Gerar a Tag 1.0.0.

:pencil: Detalhamento adicional da atividade

-.

:comet: Impactos

-.

:link: Dependências

-.

:hammer_and_wrench: Solução

$ git clone git@github.com:monanadmin/MONAN-Model.git $ git checkout develop $ git flow init $ git flow release start 1.0.0

Switched to a new branch 'release/1.0.0'

Summary of actions:

• A new branch 'release/1.0.0' was created, based on 'develop'
• You are now on branch 'release/1.0.0'

Follow-up actions:

• Bump the version number now!
• Start committing last-minute fixes in preparing your release

• When done, run:

  git flow release finish '1.0.0'

$ git push --set-upstream origin release/1.0.0

• Atualizado README.md
• Removido pasta "orig" em "src/core_atmosphere/physics/physics_monan" conforme e-mail Saulo.

CRON DEV

• Editado "setenv.bash" export MONAN_VERSION="release/1.0.0"

• Editado "cron_cd-ct.bash" para comparação com o CRON STABLE na versão 0.6.0 FCST=240

• Editado: "namelist.atmosphere.TEMPLATE" em datain/namelists para:

    config_physics_suite = 'mesoscale_reference_monan'
    config_convection_scheme = 'cu_gf_monan'

• Copiado "sources/MONAN-Model_release/1.0.0/GF_ConvPar_nml" para "scripts/"

Resultado do CRON:

Scripts_CD-CT Git Status e Git Log:
On branch develop
commit e652a8c73732bf6b5233715409945c3cba411545

EXP =  GFS
RES =  1024002
YYYYMMDDHHi =  2024060600
FCST =  240

(...)

MONAN branch name in use: release/1.0.0
convert_mpas branch name in use: develop

==> Successfully checked out and updated: release/1.0.0
commit 330dfa250760c02ea3aa507c9774d898a417e31a

(...)

real    2m21.264s
user    0m22.386s
sys 0m6.172s

real    111m8.570s
user    0m1.267s
sys 0m0.436s

real    33m25.318s
user    0m4.838s
sys 0m2.292s

(...)

06-06-2024

du -sh Pre/ Model/ Post/
9.7G    Pre/
639G    Model/
162G    Post/

//

$ git pull

remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 6 (delta 3), reused 6 (delta 3), pack-reused 0
Unpacking objects: 100% (6/6), 1.10 KiB | 21.00 KiB/s, done.
From github.com:monanadmin/MONAN-Model
   330dfa2..a61f7a2  release/1.0.0 -> origin/release/1.0.0
Updating 330dfa2..a61f7a2
Fast-forward
 GF_ConvPar_nml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 VERSION.txt    |   1 +
 2 files changed, 58 insertions(+), 59 deletions(-)
 create mode 100644 VERSION.txt

**(Atualizado README.MD)**

$ git push
Everything up-to-date

$ git flow release finish 1.0.0 --keepremote --keeplocal
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Merge made by the 'recursive' strategy.
 GF_ConvPar_nml                                                            |   120 +
 Makefile                                                                  |     4 +-
 README.md                                                                 |    57 +-
 VERSION.txt                                                               |     1 +
 comp_instructions                                                         |    18 +
 modif_v0.2_to_v0.6.md                                                     |    32 +
 monan_readme.md                                                           |    64 +
 src/core_atmosphere/Makefile                                              |     4 +-
 src/core_atmosphere/Registry.xml                                          |   136 +-
 src/core_atmosphere/diagnostics/mpas_isobaric_diagnostics.F               |     2 +-
 src/core_atmosphere/dynamics/mpas_atm_time_integration.F                  |   997 +++++++-
 src/core_atmosphere/mpas_atm_core.F                                       |     2 +-
 src/core_atmosphere/mpas_atm_halos.F                                      |    15 +
 src/core_atmosphere/physics/Makefile                                      |     9 +-
 src/core_atmosphere/physics/mpas_atmphys_control.F                        |    27 +-
 src/core_atmosphere/physics/mpas_atmphys_driver.F                         |    25 +-
 src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F              |    46 +
 src/core_atmosphere/physics/mpas_atmphys_driver_convection.F              |   703 +++++-
 src/core_atmosphere/physics/mpas_atmphys_init.F                           |     2 +-
 src/core_atmosphere/physics/mpas_atmphys_interface.F                      |    45 +-
 src/core_atmosphere/physics/mpas_atmphys_packages.F                       |     9 +-
 src/core_atmosphere/physics/mpas_atmphys_todynamics.F                     |    55 +-
 src/core_atmosphere/physics/mpas_atmphys_vars.F                           |    30 +-
 src/core_atmosphere/physics/physics_monan/Makefile                        |    41 +
 src/core_atmosphere/physics/physics_monan/lib_module_cu_gf.monan.F        |  1728 ++++++++++++++
 src/core_atmosphere/physics/physics_monan/modConstants.F                  |   293 +++
 src/core_atmosphere/physics/physics_monan/modGate.F                       |    76 +
 src/core_atmosphere/physics/physics_monan/modHenrysLawCts.F               |   532 +++++
 src/core_atmosphere/physics/physics_monan/modVector.F                     |   228 ++
 src/core_atmosphere/physics/physics_monan/module_cu_gf.monan.F            | 11310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/core_atmosphere/physics/physics_monan/module_mp_cldfra_cb.F           |   353 +++
 src/core_atmosphere/physics/physics_monan/utils_monan/modConstants.F90    |   293 +++
 src/core_atmosphere/physics/physics_monan/utils_monan/modGate.F90         |    76 +
 src/core_atmosphere/physics/physics_monan/utils_monan/modHenrysLawCts.F90 |   532 +++++
 src/core_atmosphere/physics/physics_monan/utils_monan/modVector.F90       |   228 ++
 src/core_init_atmosphere/Registry.xml                                     |     5 +
 36 files changed, 17981 insertions(+), 117 deletions(-)
 create mode 100644 GF_ConvPar_nml
 create mode 100644 VERSION.txt
 create mode 100644 comp_instructions
 create mode 100644 modif_v0.2_to_v0.6.md
 create mode 100644 monan_readme.md
 create mode 100644 src/core_atmosphere/physics/physics_monan/Makefile
 create mode 100644 src/core_atmosphere/physics/physics_monan/lib_module_cu_gf.monan.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/modConstants.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/modGate.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/modHenrysLawCts.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/modVector.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/module_cu_gf.monan.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/module_mp_cldfra_cb.F
 create mode 100644 src/core_atmosphere/physics/physics_monan/utils_monan/modConstants.F90
 create mode 100644 src/core_atmosphere/physics/physics_monan/utils_monan/modGate.F90
 create mode 100644 src/core_atmosphere/physics/physics_monan/utils_monan/modHenrysLawCts.F90
 create mode 100644 src/core_atmosphere/physics/physics_monan/utils_monan/modVector.F90
Already on 'main'
Your branch is ahead of 'origin/main' by 14 commits.
  (use "git push" to publish your local commits)
Switched to branch 'develop'
Your branch is up to date with 'origin/develop'.
Removing src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_KI
Removing src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_IK
Removing src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90
Merge made by the 'recursive' strategy.
 GF_ConvPar_nml                                                     |   116 +-
 README.md                                                          |    57 +-
 VERSION.txt                                                        |     1 +
 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90    | 13037 ------------------------------------------------------------------------------------------------
 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_IK | 12886 ----------------------------------------------------------------------------------------------
 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_KI | 13037 ------------------------------------------------------------------------------------------------
 6 files changed, 79 insertions(+), 39055 deletions(-)
 create mode 100644 VERSION.txt
 delete mode 100644 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90
 delete mode 100644 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_IK
 delete mode 100644 src/core_atmosphere/physics/physics_monan/orig/modConvParGF.F90_KI

Summary of actions:
- Release branch 'release/1.0.0' has been merged into 'main'
- The release was tagged '1.0.0'
- Release tag '1.0.0' has been back-merged into 'develop'
- Release branch 'release/1.0.0' is still locally available; it is still remotely available on 'origin'
- You are now on branch 'develop'

$ git push --tags
Enumerating objects: 2, done.
Counting objects: 100% (2/2), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 472 bytes | 236.00 KiB/s, done.
Total 2 (delta 0), reused 0 (delta 0)
To github.com:monanadmin/MONAN-Model.git
 * [new tag]         1.0.0 -> 1.0.0

$ git checkout develop
Already on 'develop'
Your branch is ahead of 'origin/develop' by 9 commits.
  (use "git push" to publish your local commits)

$ git push
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 344 bytes | 172.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
remote: Bypassed rule violations for refs/heads/develop:
remote: 
remote: - Changes must be made through a pull request.
remote: 
To github.com:monanadmin/MONAN-Model.git
   667c0af..b6a98b1  develop -> develop

$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 14 commits.
  (use "git push" to publish your local commits)

$ git push
Total 0 (delta 0), reused 0 (delta 0)
remote: Bypassed rule violations for refs/heads/main:
remote: 
remote: - Changes must be made through a pull request.
remote: 
To github.com:monanadmin/MONAN-Model.git
   2955fa6..906d94a  main -> main

Problemas Encontrados

Mais de 69 caracteres a msg da TAG aparece como acima.

Solução para alterar depois de pronto:

$ git tag 0.1.0 -f -a
$ git push origin 1.0.0 -f
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 217 bytes | 108.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To github.com:monanadmin/MONAN-Model.git
 + 2ce8484...0684abe 1.0.0 -> 1.0.0 (forced update)

:white_check_mark: Conclusão

• Release criado, versão 1.0.0.
• Alterado cron dev para 240 horas de previsão (compatibilidade de teste com a versão stable).
• Atualizado README com History.
• Versão/tag 1.0.0 gerada (https://github.com/monanadmin/MONAN-Model/releases/tag/1.0.0)

:spiral_calendar: Trabalhos Futuros

-.

[joaomas]

@egkhamis

Na pasta utils_monan fora os arquivos .F e .F90 e a outra diferença são as linhas abaixo do "modGate".

diff utils_monan/modGate.F90 modGate.F
48,49c48,49
<    logical :: p_use_gate = .true.
<    !! -for BRAMS runs, set use_gate=.false
---
>    logical :: p_use_gate = .false.
>    !! -for BRAMS, MONAN runs, set use_gate=.false

Vou manter e tirar a dǘvida na segunda.

[joaomas]

@marcelopaivaramos faça um teste usando a DTN-06 no seu repositório gerando uma versão... na sexta fazemos juntos esta oficial.

[deniseiras]

Verificar se devem ser remvidos os arquivos:

• modif_v0.2_to_v0.6.md
• monan_readme.md
• comp_instructions

[joaomas]

Aguardando confirmação do namelist por parte do Saulo.