monanadmin / monan

Repositório organizacional das atividades dos macro-grupos do MONAN - Model for Ocean-laNd-Atmosphere PredictioN
14 stars 10 forks source link

[GCC] PAD: Incorporar as atualizações do MPAS 8.0.2 no MONAN 0.3.0 #474

Closed joaomas closed 2 months ago

joaomas commented 3 months ago

:people_holding_hands: User Story

COMO Saulo, QUEREMOS incorporar as atualizações do MPAS 8.0.2 ao MONAN 0.3.0 PARA manter atualizado o MONAN.

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

:pencil: Detalhamento adicional da atividade

N/A

:comet: Impactos

N/A

:link: Dependências

N/A

:hammer_and_wrench: Solução

Executou-se os comandos abaixo para:

  1. Obter as versões 8.0.1 e 8.0.2 do MPAS
  2. Criou-se a feature monan-474-QI
  3. Comparar as versões e mostrar arquivos com diferenças
  4. Para cada arquivo diferente, executar o comando meld comparando as versões do MPAS e MONAN.
  5. As diferenças observadas entre as versões 8.0.1 e 8.0.2 foram aplicadas na versão do MONAN
wget https://github.com/MPAS-Dev/MPAS-Model/archive/refs/tags/v8.0.1.tar.gz
wget https://github.com/MPAS-Dev/MPAS-Model/archive/refs/tags/v8.0.2.tar.gz
tar -xzvf v8.0.1.tar.gz 
tar -xzvf v8.0.2.tar.gz 

git clone https://github.com/monanadmin/MONAN-Model.git
cd MONAN-Model
git flow init
git flow feature start monan-474-QI
cd ..

diff -uqr MPAS-Model-8.0.1 MPAS-Model-8.0.2/

meld MPAS-Model-8.0.1/src/core_atmosphere/Registry.xml MPAS-Model-8.0.2/src/core_atmosphere/Registry.xml MONAN-Model/src/core_atmosphere/Registry.xml 
meld MPAS-Model-8.0.1/README.md MPAS-Model-8.0.2/README.md
meld MPAS-Model-8.0.1/README.md MPAS-Model-8.0.2/README.md MONAN-Model/README.md 
meld MPAS-Model-8.0.1/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F MPAS-Model-8.0.2/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F MONAN-Model/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F
MELD MPAS-Model-8.0.1/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F MPAS-Model-8.0.2/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F MONAN-Model/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F 
meld MPAS-Model-8.0.1/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F MPAS-Model-8.0.2/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F MONAN-Model/src/core_atmosphere/physics/physics_wrf/module_mp_thompson.F 
meld MPAS-Model-8.0.1/src/core_init_atmosphere/Registry.xml MPAS-Model-8.0.2/src/core_init_atmosphere/Registry.xml MONAN-Model/src/core_init_atmosphere/Registry.xml 
meld MPAS-Model-8.0.1/src/core_landice/Registry.xml MPAS-Model-8.0.2/src/core_landice/Registry.xml MONAN-Model/src/core_landice/Registry.xml
meld MPAS-Model-8.0.1/src/core_ocean/Registry.xml MPAS-Model-8.0.2/src/core_ocean/Registry.xml MONAN-Model/src/core_ocean/Registry.xml
meld MPAS-Model-8.0.1/src/core_seaice/Registry.xml MPAS-Model-8.0.2/src/core_seaice/Registry.xml MONAN-Model/src/core_seaice/Registry.xml
meld MPAS-Model-8.0.1/src/core_sw/Registry.xml MPAS-Model-8.0.2/src/core_sw/Registry.xml MONAN-Model/src/core_sw/Registry.xml
meld MPAS-Model-8.0.1/src/core_test/Registry.xml MPAS-Model-8.0.2/src/core_test/Registry.xml MONAN-Model/src/core_test/Registry.xml
meld MPAS-Model-8.0.1/src/operators/mpas_geometry_utils.F MPAS-Model-8.0.2/src/operators/mpas_geometry_utils.F MONAN-Model/src/operators/mpas_geometry_utils.F

Em seguida, foi executado um teste simples para validar a Branch de atualização (24 km, 24h, com a mesma stream_list.atmosphere.diagnostics do TC, variáveis comparativas prec e temp - todos os níveis)

Image

Image

a branch de desenvolvimento foi fechada e incorporada a develop.

:rotating_light: Problemas encontrados

:white_check_mark: Conclusão

:spiral_calendar: Trabalhos Futuros

N/A

egkhamis commented 3 months ago

Um script simples para checar a diferença entre duas tags do MPAS (apenas de código):

#!/bin/bash

git clone https://github.com/MPAS-Dev/MPAS-Model MPAS-Model.8.0.1
cd MPAS-Model.8.0.1
git checkout v8.0.1
cd ..
git clone https://github.com/MPAS-Dev/MPAS-Model MPAS-Model.8.0.2
cd MPAS-Model.8.0.2
git checkout v8.0.2
cd ..

file="diff.txt"

diff -qr MPAS-Model.8.0.1 MPAS-Model.8.0.2 | grep Files | grep F | sed 's/^Files //' | sed 's/and//g' | sed 's/ [^ ]\+ *$//g' | sed '/.git/d' | sed '/.xml/d' | sed '/.md/d' > $file

while read -r line; do
    echo -e "meld $line\n"
    meld $line
done <$file

rm $file