HAM M7 with most of its implementation history#1
Open
plesager wants to merge 129 commits into
Open
Conversation
- t255 m7 tests should be passed - the t21 tests will fail as the initial conditions/emissions are inconsistent.
- Identical AER output as release version
- t255_test_compo_fc_m7
OIFS-513 setting LAER3D false to inhibit reading of 3d climatology
OIFS-514 update the m7_aero.nml with current tracer names
Squashed commit of the following:
commit e924b4e38c8704213c040a0bb9fe6a751c8d1ee8
Merge: e7f2b64 600ba20
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Tue Apr 9 08:01:34 2024 +0000
Merge branch 'add-m7-lh' of https://git.ecmwf.int/scm/~nm6/openifs-48r1 into add-m7-lh
commit e7f2b64bae06ac9e3cd25b729f8bee0f568d6bfe
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Tue Apr 9 07:55:05 2024 +0000
OIFS-513 setting LAER3D false to inhibit reading of 3d climatology in t255_test_compo_fc_m7
commit 600ba20be555e74f42bb04bab8ba4f50db936d2e
Merge: 0bb7fce 72f9be4
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Tue Apr 9 07:04:57 2024 +0000
pull before merge
commit 0bb7fce6e4e7316edbc3e98f05dfe1d247dd75a1
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Tue Apr 9 07:02:33 2024 +0000
identical AER output as release version by restore ZAERFLX
commit 72f9be4374f7d93fd56e0ca5dc4e56f2743bcde4
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Mon Apr 8 11:29:36 2024 +0000
OIFS-514 update the m7_aero.nml with current tracer names.
commit 5e4321fe6c49d9ac1239626739eeba8a178f1108
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Fri Apr 5 13:55:43 2024 +0000
remove ZALBD(not used) and update inout features of YDMODEL
commit a5c2116c922b3caa0e831ff2aacd065956f4936d
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Thu Apr 4 14:29:04 2024 +0000
merge with fixgnu for aerosol radiation
commit 296279c455a446208b222555b82b6f4db57dc385
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Thu Apr 4 09:15:42 2024 +0000
backup before merge fixgnu files
commit b89cb24ce380e7e44076b9ea2d51afd3f20ba73e
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Thu Apr 4 07:46:02 2024 +0000
remove aerosol_ham and use aerosol for M7 optical properties
commit 5fbb448210f6e11c60933172c622a3945832013d
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Wed Apr 3 11:16:07 2024 +0000
remove not needed tracers in aerini_layer
commit d5bc7a5ec57df3d1556fb9e56b2fea552a44a4ae
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Wed Mar 27 14:39:03 2024 +0000
recover commented lines in aerini_layer
commit a36b1d6be2bc15dfbe4b1d9c6b21ea375469ceaa
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Wed Mar 27 14:08:59 2024 +0000
inconsistent aer aerosol scheme simulation
commit 36050b346c434c443473f60722752d0d0c76a2a0
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Tue Mar 26 19:39:25 2024 +0000
add if statement for deallocate
commit c61bbce6cd372ea310eab25c96eec03259448d1d
Merge: 54d21aa b41f567
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Thu Mar 7 14:11:09 2024 +0000
Merge remote-tracking branch 'pls/knmi-m7' into add-m7-lh
commit 54d21aa4e529ef8fc692cc9eddb9e06dbf65928a
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Thu Mar 7 14:09:59 2024 +0000
conflicts
commit b8d90421515197e8c0c615af58aba1323a771d1f
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Tue Mar 5 10:25:03 2024 +0000
running gnu version
commit 31f5d573082435f18f276d9999eb4f7579210e5b
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 6 15:25:58 2024 +0100
optimize array deallocation
commit 3b603d9680057ec68e4576c55c0df6235b74a134
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 6 15:23:51 2024 +0100
first running version
commit 20bea69ec002c897efa3933550e0406f2a791bed
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Fri Feb 9 09:45:17 2024 +0000
fix bugs in m7 and chem_tm5 when using zero emissions
commit 4e1db52d9cf0f436924ca7860143f1700366f1fb
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 6 15:11:51 2024 +0100
passing radting run but still many issues
... and 1 more commit
Merge in ~NM6/openifs-48r1 from feature/knmi/OIFS-516-non-zero-m7-tracers to knmi-m7
Squashed commit of the following:
commit 86ccecd94d15ba8bc312848b1525b8d0d3bb9726
Author: Philippe Le Sager <sager@knmi.nl>
Date: Tue Apr 30 09:09:49 2024 +0200
Tidy up the code
commit 869fc0d9d056e9dd2a3aa32904042d8ae44e25dc
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Wed Apr 24 20:43:52 2024 +0000
OIFS-523 fix code crush in deallocation by fixing inconsistent array
commit 8f2aab21a42bcdbedbabb17e5ede9fe849dfaa74
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Wed Apr 24 18:50:08 2024 +0000
deallocate array
commit c44fd0377b177bcfc43545b78b045b7ecc726bde
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Wed Apr 24 08:40:39 2024 +0000
Revert "OIFS-521 update M7 tracer names"
This reverts commit 268b5bb1481cc1975dd831a88455be0601d37b28.
commit 268b5bb1481cc1975dd831a88455be0601d37b28
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Fri Apr 19 10:46:00 2024 +0000
OIFS-521 update M7 tracer names
commit a425daf4fa20c5e4ca20c5cc11567af1a30e6a6b
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Tue Apr 16 09:00:24 2024 +0000
OIFS-516 fix crush in radiation_scheme
…anges in code.
Merge in ~NM6/openifs-48r1 from ~NLD5163/openifs-48r1:rchg/knmi-m7-fix-ifstest to knmi-m7
Squashed commit of the following:
commit a35d2a8e99fb8832f329a862ff87ead72a23b751
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Wed May 1 12:48:25 2024 +0000
Solved ifs-test for m7 using Lianghai Wu changes in code. Main difference is only ifs-test/tests/t255/common/m7/m7_aero.nml. Other changes are most cosmetic or to try to remove unused variables in several subroutines
…RRTM=F Merge in bugfix/knmi-m7-OIFS-530 to knmi-m7 This commit also - Adds the OIFS_DEBUGGER environment variable that can be used by oifs-run script to launch the debugger - Cleans up, tidied up and adds comments to several radiation/aerosols routines - Adds .gitignore - Adds compilation warning of non-used variables for GNU compiler
…icle emissions
Merge in ~NM6/openifs-48r1 from ~NLD5163/openifs-48r1:knmi-m7-temporal to knmi-m7
Squashed commit of the following:
commit cf243f61d3d2f5c03e18e79372cacb41d542fddc
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Jul 8 17:38:28 2024 +0200
Fix an FPE I got with GNU with explicit array index range
commit 6b9ca403bdb061feed4932a7ea215777733b8fc1
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Mon Jul 8 09:17:14 2024 +0000
Adding arpifs/radiation changes derived from emission improvements for m7
Merge in ~NM6/openifs-48r1 from ~NLD5163/openifs-48r1:rchg/knmi-m7-dev to knmi-m7
Squashed commit of the following:
commit 0b78a0e63cfae21bccf4075878de4d3bf62f01e3
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Thu Jul 18 07:49:20 2024 +0000
Just second step of removing files for the staged area
commit 05e3a8f96d83b6f652d8e53802eaf7abfb855fee
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Thu Jul 18 07:42:19 2024 +0000
Moved m7 related source files into dir. m7
When possible the hierachical structure is preserved so subdirectories
phys_ec, module, chem were created.
Note 1: mo_ham_m7.F90 and mo_ham_m7_nucl.F90 has been moved to modules
but another natural direc. is phys_ec as they have subroutines for
physical modelling.
Note 2: There is a file that describe namelist for clt that is left
in the path arpifs/namelist/
Note 3: The file ifs-source/arpifs/m7/module/yomm7ctl.F90
probably could be left in ifs-source/arpfis/module as it is related
to the namelist for m7clt. We moved because it can be easier
to have there during the development process.
commit 19f68d213594f447bb8846edf882c964bc4f452b
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Wed Jul 10 14:34:46 2024 +0000
added chantes in cmake to ensure arpifs/m7 is included in the pre-processing
commit cf8e4d76f31ddaa02625de42cb7c3ac3161ed3c3
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Wed Jul 10 13:40:50 2024 +0000
Ensure that files moved files are also removed from stash area (git add -u)
commit 049c37bebff736785ec9348188d11d60ccd529e1
Author: Ramiro Checa-Garcia <ramiro.checagarcia@knmi.nl>
Date: Wed Jul 10 13:38:40 2024 +0000
Set of subroutines and modules needed for CNT4.F90 initialization as a complete set moved to m7 (and modules to m7/module)
Squashed commit of the following:
commit d63693731f99beca83adb2ce383c1bede35f3ad6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Jul 18 10:21:05 2024 +0200
[M7 test] Do not load MACC aerosols climatology
commit 616ede2d316cc1e4f4ff15ba2d858ce786aca5a2
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Jul 15 16:01:26 2024 +0200
[M7 test] Use TM5 routines to compute optical properties & run 1 day
commit e2910c463b8f5a116a2a0ab87c4e2cd7b2297d6c
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Jul 11 18:05:30 2024 +0200
Revert default NAERMACC and remove unnecessary allocations
The default NAERMACC for M7 was set to 0 in PR3. Not only this is
not needed, but (at least with GNU) it must be set to 1. Note that
namelist value takes precedence in any case.
commit 8a13a79acb88902bdead12f0e74a0234fdcaca8d
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Jul 11 17:46:02 2024 +0200
Prevent crashes in case of NAEROOPT=1 with GNU
Some of the fixes are very likely to have effects with NAEROOPT=2 (the
default) and/or with Intel compiler
commit 60c9758e17e643563c7cb745769e9c45680ae242
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Jul 11 17:30:21 2024 +0200
Log M7 aerosol optics/cloud parameters
commit 56eddd3ab5856b6e56d0bc6af767725c62251d17
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Jul 4 10:44:00 2024 +0200
Add emissions to T255/M7 ifs-test
commit a3cd13c4bb062a5cd4a4caa50f216967c1ea740b
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jul 3 15:15:48 2024 +0200
Allocate 2 full nodes for ifs-test on hpc2020@ECMWF
Use all these resources for T255/M7 test for a reasonable runtime
commit e7df04a5ea221b6f4723c37f401c980903a10279
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jul 3 09:08:24 2024 +0200
Initialize M7 tracers from IC in T255/M7 ifs-test
commit 553ef889d9047c2dac8d3455130fc21339ac9dd7
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jul 3 09:07:12 2024 +0200
Switch off drydep in t255/m7 ifs-test
commit 25ee3c630a756f30d7c8d5495a8b2f9e011ccc9b
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jul 3 09:02:08 2024 +0200
Add IC with readable M7 tracers for t255/M7 ifs-test
Merge in ~NM6/openifs-48r1 from OIFS-546-updates to knmi-m7
Squashed commit of the following:
commit f2c67343a0e8d3f6c9d3f11be6fa33fb3682a6e2
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Aug 22 08:59:35 2024 +0200
Trap missing M7 lookup table files; account for them in T255-M7 test
Also switch back to default HAM optical code for T255-M7 ifstest,
since it is now working after reading the lookup tables.
Some cleanup (mainly remove hardcoded paths)
commit 5d5c68a35564be432783db34ca2a258b7fee54a3
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Fri Aug 16 07:17:13 2024 +0000
use runtime path for M7 mie tables
commit 09ef1a2183e4edf604d9c5ae32c051b75f662056
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Fri Aug 2 19:08:13 2024 +0000
OIFS-546 fix aerosol optical properties bugs
…er OIFS-544
Merge in ~NM6/openifs-48r1 from OIFS-544-import-43r3-m7-updates-into-48r1 to knmi-m7
Squashed commit of the following:
commit bcd3f85ab7e026790b5d500e9c4804d69bffc57e
Author: Philippe Le Sager <sager@knmi.nl>
Date: Fri Sep 20 09:24:19 2024 +0200
Bring last changes for liquid SO4 fixes from 43r3 (OIFS-504)
commit 19da085f46d9756f93da544816a38e4795c19a84
Author: Philippe Le Sager <sager@knmi.nl>
Date: Fri Sep 20 09:05:59 2024 +0200
Force ice/water number densities to at least 1/cm3
commit 8b56a9fba429604a88899b5b034b4d227b60f894
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Sep 19 14:55:43 2024 +0200
Add emissions of number of particles to ifs-test/T255-M7
commit fd92680f51a8104d1ed1622012750c6fdb892409
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Sep 18 15:12:22 2024 +0200
Initialize tracer tendencies sent from chemistry to aerosols scheme
commit 92a18cb0beabb8db57a2fe59f69b25b5763646e6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Sep 16 14:55:30 2024 +0200
Update namelist for T255/M7 test
commit b7b5f97c61286a247158e3ad9d5aa90bf2bf8b39
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Sep 16 12:59:44 2024 +0200
Switch off OpenMP in T255/M7 test
commit 8d660357c3c4636fc8b88f073a6987a4c0056dcd
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Sep 12 17:21:49 2024 +0200
Fix link for t255 test, and very minor cleanup
commit c6911d363dfd9790fd016a4948d4080b8e4704c6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Sep 12 14:45:27 2024 +0200
Prevent FPE due to uninitialized data with GNU
commit 1a2cf0a3c3807d7a23a101016e987986e6f8ecc6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Sep 9 19:14:13 2024 +0200
Switch from tm5_wetchem to tm5_wetchem_m7 in case of M7
commit 658f3c947d403a1df4d1a72ce7e14e437159eabd
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Sep 9 19:05:07 2024 +0200
Fix SO4 tendency (partial)
commit e08c3159f4b5c355231f8aed06d559df2f0d22d5
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Sep 9 18:59:44 2024 +0200
Correct initial concentration of SO4 in case of M7 in chemistry
commit 5456159041639ceefec9e34d0856d41804dd0a08
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Tue Jun 25 11:48:59 2024 +0000
OIFS-544 merge 43r3 updates into 48r1
- Add implicit solver for sedimentation
- Account for two case (convective and stratiform) for wet dep
…iagnostics
Merge in ~NM6/openifs-48r1 from bugfix/optprop-diag-wvl to knmi-m7
Squashed commit of the following:
commit 392a5db70cdc27f6835bf08492e39ee474d50189
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Nov 27 16:58:21 2025 +0100
Account for difference between 'kproma' and 'kbdim' in refractive index interpolations
Merge in ~NM6/openifs-48r1 from bugfix/strataero to knmi-m7
Squashed commit of the following:
commit 265f69c9c8948ebd9a19eeb8ba17c9c4ff9b1c11
Merge: f97211c 445383a
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Nov 27 17:25:28 2025 +0100
Merge remote-tracking branch 'origin/knmi-m7' into bugfix/strataero
commit f97211c1b1c64ae7587c961594ebc77887c2549f
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Nov 27 16:51:48 2025 +0100
Use explicit indices in strat process
commit 2e1c2b0481a3a33af10158ce2ef0772f02615a66
Merge: 8abae0d c5ad923
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Nov 26 16:43:02 2025 +0100
Merge remote-tracking branch 'origin/knmi-m7' into bugfix/strataero
commit 8abae0d153b4857832756a6f4b0524648d60f6a2
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Nov 26 16:41:14 2025 +0100
Align with EC-Earth4 version
commit a7c4edc900204cd5f602adf5e6e8e609e4f51436
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Nov 26 16:34:45 2025 +0100
Fix indentation of the code (only whitespace changes\!)
commit 2775da5c884f420ab2f6690c1d9ca1a84cd97422
Author: Philippe Le Sager <sager@knmi.nl>
Date: Tue Nov 25 17:47:30 2025 +0100
Fix strataero array size
commit c38bbd9ee7bb38ec605463e7cfce34f133193a61
Author: Philippe Le Sager <sager@knmi.nl>
Date: Tue Nov 25 16:43:37 2025 +0100
Fix decision tree for cases requiring background data
…in wet removal
Merge in ~NM6/openifs-48r1 from bugfix/OIFS-652-using-lwc-and-iwc-inconsistencies to knmi-m7
Squashed commit of the following:
commit c0da836c388294e7cfb4e75deaffc5b7a0645eaf
Author: Philippe Le Sager <sager@knmi.nl>
Date: Tue Dec 16 12:47:29 2025 +0100
Cosmetic changes
commit 5cc013c9b4f326f1b210161638702dd94a18f2a8
Author: Eemeli Holopainen <eemeli.holopainen@fmi.fi>
Date: Fri Dec 12 12:47:24 2025 +0200
Correct using in-cloud values for cloud variables in wet removal. Correct LWC and IWC inconsistencies with effective radius.
Merge in ~NM6/openifs-48r1 from bugfix/OIFS-650-ss-dry2wet-radius-conversion to knmi-m7
Squashed commit of the following:
commit 7e36d43ce73db369af12c4315beff843734ba2ea
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Dec 18 11:40:11 2025 +0100
Update dry-to-wet radius conversion factor for seasalt
…ong run)
Merge in ~NM6/openifs-48r1 from bugfix/calendar-strataero to knmi-m7
Squashed commit of the following:
commit 1cf0a56d3eaec39fab18e531809f706f12742624
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jan 7 18:36:49 2026 +0100
Fix handling of update flag
commit d6214dfeb3a00a4c1647ce88cf5e7647dd0a53ee
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Dec 17 16:49:53 2025 +0100
Fix date retrieval for CMIP strat aero
Accounts for long integrations
Merge in ~NM6/openifs-48r1 from feature/OIFS-632-back-port-pm-output-from-cams-ifs to knmi-m7
Squashed commit of the following:
commit 3639ccec1825d31b20975173b05ac6b262a4447d
Merge: 2dbe850 a7f1335
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jan 14 16:29:52 2026 +0100
Merge 'origin/knmi-m7' into feature/OIFS-632-back-port-pm-output-from-cams-ifs
commit 2dbe850d8ca6b286a71084dc5a00b11b763b640d
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Wed Jan 14 14:24:46 2026 +0000
cleanup
commit 0b396b53c9dffb830b69ae3ad968e3582187f941
Merge: 28cccb7 20faee6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Dec 18 12:00:42 2025 +0100
Merge 'knmi-m7' into feature/OIFS-632-back-port-pm-output-from-cams
commit 28cccb7d135518200ebdde65ec9d470e2295e94c
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Thu Dec 18 08:01:35 2025 +0000
remove input parameter which is not needed anymore
commit 43c6815f72e7e90f7ccfc69a435e8ac82c09542b
Author: Tommi Bergman <tommi.bergman@fmi.fi>
Date: Wed Dec 17 11:54:02 2025 +0000
latest updates from CAMS + cleanup
commit 4ff3e70c11c18ebef4d37dc6e22fb0f287cdf935
Author: tommibergman <tommi.bergman@iki.fi>
Date: Fri Oct 17 16:24:00 2025 +0300
Add PM 1, 2.5 and 10 calculations
… and OIFS-532 (tm5/bascoe scheme restartability)
Fixes two bugs:
- remove double counting of inline dust and seasalt emissions in case tracer transport by vertical diffusion is turned on (LVDFTRAC=T)
- allow model to restart when using TM5 or BASCOE chemistry scheme
Squashed commit of the following:
commit a946dddf9d6ded046d764699897276c7c37ed5af
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jan 28 15:05:34 2026 +0100
Fix restart for BASCOE scheme
commit 499a516ee75a01e75ac85d95e1157b4c3197fbad
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Jan 28 14:44:37 2026 +0100
Remove unneeded debug comment
commit 12665bb769b03251c855a6ab2ef941720e3c0927
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Tue Jan 27 12:00:27 2026 +0000
cleanup
commit f3dafae821ddfe96710adcde9ac79a86715253a1
Merge: 515edb8 9e46a70
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Tue Jan 27 11:18:52 2026 +0000
Merge branch 'knmi-m7' of ssh://git.ecmwf.int/~nm6/openifs-48r1 into knmi-m7
commit 515edb88debb74484711f686e37870e059dbe384
Author: Lianghai Wu <nklw@ac6-102.bullx>
Date: Tue Jan 27 11:16:45 2026 +0000
avoid double accounting of sea salt and dust emissions
commit 1107ec2f8f3ea84a7cedfa6794ba81d36729aabb
Author: Lianghai Wu <nklw@ac6-100.bullx>
Date: Thu Jan 22 11:36:06 2026 +0000
full chem restartbility
…wet removal
Merge in ~NM6/openifs-48r1 from bugfix/OIFS-666-double-addition-of-cdnc-and-icnc-to-wet-removal to knmi-m7
Squashed commit of the following:
commit 1345052181149e0d4acbc1f0e1788747d6772f71
Author: Eemeli Holopainen <eemeli.holopainen@fmi.fi>
Date: Wed Jan 28 12:33:21 2026 +0200
Fix double adding of CDNC and ICNC tendencies to wet removal.
Merge in ~NM6/openifs-48r1 from OIFS-668-fix-aop-diagnostic to knmi-m7
Squashed commit of the following:
commit 9a07032bbfda14ac94b816175589d947fb8ed008
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Feb 11 15:55:36 2026 +0100
Fix AOP diagnostic for NRADFR/=-1
Merge in ~NM6/openifs-48r1 from knmi-m7_bsc_dust to knmi-m7
Squashed commit of the following:
commit e3013b6a24af88e67c91695666388860129b9f80
Merge: 6b2724e 0789d5d
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Feb 19 11:16:25 2026 +0100
Merge branch 'origin/knmi-m7' into knmi-m7_bsc_dust
commit 6b2724ea4ea80f71cbd22e5812fe767e5db7fc75
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Feb 19 10:50:38 2026 +0100
Bug fix
commit 67a5ffb2bb2c33a8c8cb8b339f9eaa6a0de6ef03
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Feb 19 09:43:53 2026 +0100
Bugfix
commit db99ce6046c2bef45f3650e0a71ee5115382ad4f
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Feb 18 17:30:43 2026 +0100
cosmetic
commit 6970012c1c772e8b8457518e47b3cb21c330d66f
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Feb 18 16:02:55 2026 +0100
Remove unused declarations
commit 5c005497c0fe400fd38a075da371606dbe9dc461
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Feb 18 15:25:58 2026 +0100
Remove unused USE statements
commit 336555b8d500bb7d6088ce52e414122ada377fb2
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Feb 18 10:29:07 2026 +0100
Cosmetic round
commit 8e93b49012b50d2bc65815ee3f73b74e923f4f7b
Merge: 27e9f2f 12d109b
Author: Philippe Le Sager <sager@knmi.nl>
Date: Sun Feb 15 10:29:47 2026 +0100
Merge remote-tracking branch 'origin/knmi-m7' into knmi-m7_bsc_dust
commit 27e9f2f5a2e017c50ba108c06e09adb9fa213cb0
Author: Philippe Le Sager <sager@knmi.nl>
Date: Sun Feb 15 10:00:29 2026 +0100
Clean up (cosmetic/info)
commit b581dae589bc5f028f7d8254ec40ec009ed7217d
Author: Philippe Le Sager <sager@knmi.nl>
Date: Sun Feb 15 09:59:31 2026 +0100
Set default to dust namelist entries
commit f13e26236b341c448f4dc8c572030eec123f3d91
Author: Philippe Le Sager <sager@knmi.nl>
Date: Sun Feb 15 09:57:44 2026 +0100
Change location of auxiliary file for Tegen scheme
commit 9b52ea00f28c4d99aeacb382233e877bf7632fd7
Author: Philippe Le Sager <sager@knmi.nl>
Date: Sun Feb 15 09:56:19 2026 +0100
Read data for Tegen dust scheme only if scheme is activated
commit ab58f7f4816d57db0a494350b316d449be0bf059
Merge: a190284 882fda2
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Mon Feb 2 14:41:13 2026 +0100
Merge branch 'knmi-m7_bsc_dust' into dust
commit 882fda2e91d97d2a61adee19c8dee1598e326f04
Merge: 61dd4a9 9e46a70
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Fri Jan 23 16:53:26 2026 +0100
updated base on knmi-m7
commit 61dd4a9c6d28e1cc6ba797522db88ceaf307b0db
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Fri Jan 23 15:31:56 2026 +0000
tm5m7_src.F90 edited online with Bitbucket
commit 53ce51ff9ad5a82964457d16c9db23d5cdfe7c09
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Fri Jan 23 15:30:09 2026 +0000
tm5m7_src.F90 edited online with Bitbucket
commit efc5caa919b105e77ee1512df994834e3c4cb969
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Fri Jan 23 15:29:39 2026 +0000
tm5m7_src.F90 edited online with Bitbucket
commit 4aaffa6a24959dcbe0f12f1885728e62e89be33f
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Wed Nov 5 15:22:05 2025 +0100
Undo MN5-dependent changes
commit 7df9b3815df9d5dd2b10cde5e41d1626b604850b
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Thu Nov 6 14:39:57 2025 +0100
Remove leftover dust diagnostic
commit 919488c4a15bd1568af33b43358877d02b66fb4f
Merge: 9815110 f8d0e56
Author: Marios Chatziparasch <marios.chatziparaschos@bsc.es>
Date: Wed Nov 5 16:11:22 2025 +0100
merge with knmi_m7
... and 6 more commits
Merge in ~NM6/openifs-48r1 from OIFS-661-mn5-arch to knmi-m7
Squashed commit of the following:
commit 6a125bbbe6d6dd764912c56c94f2fefd6e9eaed3
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Wed Jan 14 16:00:39 2026 +0100
Clean up
commit 1fbbdff20ba7c23252059bd71b7408b6cbbcdd64
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Mon Dec 22 14:14:10 2025 +0100
Fix Intel env's
commit 535ad4f8c82650ac74c3bf41bd3141d8283456b3
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Mon Dec 22 14:11:57 2025 +0100
Change default MN5 arch to Intel+OMPI
commit 692e493011141a1d19c0cff3f59bce80c1fa79f9
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Mon Dec 22 11:06:52 2025 +0100
Add default MN5 arch
commit 61677fca5bd33c050902230cb7f1ae6d185658c8
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Mon Dec 22 10:36:57 2025 +0100
Add MN5 case to set_launcher (ifs-test)
commit d3e4762fab2ac14d783a4b874b320a89794cb42a
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Mon Dec 22 10:22:18 2025 +0100
Add BSC arch files
commit 8c304c8f0d3f7a89b2ab0e814e330605b08b4d2f
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Fri Dec 19 15:42:31 2025 +0100
Fix for Intel 2023.2.0
…n computation
Merge in ~NM6/openifs-48r1 from fix_mn_zwlarge to knmi-m7
Squashed commit of the following:
commit 31131003b6d0420c3062401482131ed442d6aef4
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 11 14:11:11 2026 +0100
More cleanup
commit c7f330fb6383c1489c128c8c33bff48db856d0ab
Author: Lianghai Wu <nklw@ac6-101.bullx>
Date: Tue Mar 10 12:37:00 2026 +0000
cherry pick to fix too strict zwlarge condition
…, M7)
Merge in ~NM6/openifs-48r1 from bugfix/mbn-sp to knmi-m7
Squashed commit of the following:
commit bbefb61c84c987fa0e66cd4015e4b4caeb0b3768
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Mar 12 09:13:03 2026 +0100
Avoid division by zero in M7 in SP
commit 140f2db4d713b13e43c432607e6d037e4f204636
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 11 16:11:13 2026 +0100
Remove assignment to unallocated arrays
commit 429c768da7b7be913095d6bfe77013d71425c875
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed Mar 11 14:26:07 2026 +0100
Fix MBN for SP
|
Important Review skippedToo many files! This PR contains 300 files, which is 150 over the limit of 150. To get a review, narrow the scope: Upgrade to a paid plan to raise the limit. ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (300)
You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…cles
Merge in ~NM6/openifs-48r1 from knmi-m7-coagulation-fix to knmi-m7
Squashed commit of the following:
commit 0b9a6b94aa0bc2139eb2529f2f2e28f5caf34074
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 15:04:18 2026 +0200
Cleanup
commit 4da63c69d631748bfb2e51a5437760a6697d6f52
Merge: c5e128e 66c890a
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 15:00:11 2026 +0200
Merge remote branch 'origin/knmi-m7' into knmi-m7-coagulation-fix
commit c5e128ee44463e500f4f9600dcf4da5dbfed3f17
Author: Harri Kokkola <harri.kokkola@fmi.fi>
Date: Tue Mar 17 09:27:41 2026 +0200
Fix for Issue OIFS-672
Double counting of mass in Subroutine m7_delcoa in mo_ham_m7.F90
Merge in ~NM6/openifs-48r1 from bugfix/openmp to knmi-m7
Squashed commit of the following:
commit 77d946ca265898b1241a8207ba012ca068842d7a
Merge: d017f72 ccfdc0b
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 15:08:12 2026 +0200
Merge remote branch 'origin/knmi-m7' into bugfix/openmp
commit d017f72ced5d6993fac33177d0415165934871b6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Feb 19 13:02:46 2026 +0100
OpenMP fixes
Merge in ~NM6/openifs-48r1 from fix/mn5-arch-update to knmi-m7
Squashed commit of the following:
commit 46cef349f7579a417be376efbfc61bdcb0cdeedc
Merge: 368ecdc 6599ae5
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 15:24:02 2026 +0200
Merge remote branch 'origin/knmi-m7' into fix/mn5-arch-update
commit 368ecdc013b23bbe38bc53b0891c4e142fbc9d9d
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Fri May 8 10:08:59 2026 +0200
Remove duplicated if block
commit 4efb4de8ab4751357a6d66f0c0408bb7225caa38
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Thu May 7 08:32:06 2026 +0000
Remove some exports from MN5 IMPI arch
commit e7188d930da85ee9014a4e6360bd661a81bf018b
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Wed May 6 13:51:48 2026 +0000
Fix "if" syntax in set_launcher.bash
…hemistry
Includes:
- Compute diurnal cycle in double precision (does'nt make a difference but kept in DP)
- Pre-compute some constant (does'nt make a difference but kept in DP)
- Fix liquid volume fraction computation and aqueous phase test ( **this was broken in SP** )
Squashed commit of the following:
commit 29a4eb6d0598bd4a01ede6ffc92f234473265516
Merge: 4e063b7 ad446f6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 27 11:15:05 2026 +0200
Merge knmi-m7
commit 4e063b76ce4d4d8c0c1a9658d6e6967ba71d194b
Merge: 145300f 6599ae5
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 19:29:27 2026 +0200
Merge remote branch 'origin/knmi-m7' into so2so4-always-dbl
commit 145300fe72c37035832a28111ea503eee5d84ae2
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 14:01:35 2026 +0200
Cleanup
commit 72a984916bd0c4eb30e6ab0b05f1d49cb6d5af6f
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 13:44:34 2026 +0200
Fix liquid volume fraction computation and aqueous phase test
commit 6f259b9372fcf08f796d14dba8bdcb65f4fbe7b5
Author: Philippe Le Sager <sager@knmi.nl>
Date: Wed May 20 11:28:04 2026 +0200
Pre-compute some constant
commit c1d802d6ca516384c8c3cfc071750b3d54564cff
Author: Philippe Le Sager <sager@knmi.nl>
Date: Tue May 19 21:12:58 2026 +0200
Compute diurnal cycle in double precision
commit fbc3e4cfe5d1e2936ff2cd85ddf3f9f66353f37f
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Apr 16 18:52:38 2026 +0200
typo
commit be553eb5d10da48c5a949bfb2acaa53fb703fd89
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Apr 16 17:10:28 2026 +0200
First shot at enforcing dbl precision in so2so4
commit d017f72ced5d6993fac33177d0415165934871b6
Author: Philippe Le Sager <sager@knmi.nl>
Date: Thu Feb 19 13:02:46 2026 +0100
OpenMP fixes
Merge in ~NM6/openifs-48r1 from tegen-nc-read to knmi-m7
Squashed commit of the following:
commit ee5e31cd62806b4b63370cf408741bd6e82fdba6
Author: Simone Vacondio <simone.vacondio@bsc.es>
Date: Wed May 27 15:11:46 2026 +0200
Restore Tegen dust clim condition
Restore Tegen dust climatology condition for setup: Tegen setup is only done
when NDDUST=8.
Merge in ~NM6/openifs-48r1 from OIFS-683-fix-reffice to knmi-m7
Squashed commit of the following:
commit 7b4b600b204bf8fd04ade94f09e67463073199de
Author: Philippe Le Sager <sager@knmi.nl>
Date: Mon Jun 8 18:14:20 2026 +0200
Fix ice Reff in case of MBN cloud activation scheme
plesager
force-pushed
the
hamm7-with-history
branch
from
8377ccd to
d26e031
Compare
Several strategies are applied to resolve discrepancies between SP and DP experiments: * Use the standard erf implementation to compute CDF and its complement * Use the same threshold value to guard against FPEs and for physical branch cutoffs regardless of precision * Add M7 threshold to log * Force H2SO4 condensation/budget code (m7_prod_cond) to double precision: The H2SO4 gas-phase condensation calculation in working precision with unguarded division by pcs (condensation sink) and multiple catastrophic cancellations. In SP, this creates large errors: - Division by pcs without adequate floor amplifies noise - Analytic solution: (zh2so4_cf0 - dpso4g/pcs)*exp(...) + dpso4g/pcs loses significant digits when dpso4g/pcs >> zh2so4_cf0 - Second cancellation: zfcond_cf = zh2so4_cf0 - zh2so4_cf1 Fix: enforce DP computations, casting input into DP and output to working precision. This mirrors the nucleation treatment (already forced to JPRD) and removes a major SP divergence source in the condensation pathway. * Remove unneeded minimum value in one radius average computation * Increase test robustness in mo_ham_rad * Make a safe division more robust in kappa computation in mo_ham_m7 * Better guard against division by 0 in wetdep * Remove if statement before call to CCNSPEC in MBN * Straighten some constant declaration
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
9 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.
This is a rebase of the original implementation of HAMM7 in OIFS, before the latter became open source.