Opened 4 years ago
Closed 4 years ago
#2515 closed Defect (fixed)
Inconsitency in checks for ORCA cn_cfg parameter
| Reported by: | acc | Owned by: | acc |
|---|---|---|---|
| Priority: | low | Milestone: | Unscheduled |
| Component: | MULTIPLE | Version: | trunk |
| Severity: | minor | Keywords: | |
| Cc: |
Description
Context
There is some inconsistency in the checks of the cn_cfg namelist parameter when used to trigger ORCA specific treatment.
Analysis
This could probably be rationalised to only check for upper case matches but, at the very least, the upper case version should be included in all checks. This is because cn_cfg can be set in domain.F90 if an integer variable called ORCA is found within the domcfg.nc file. In this case cn_cfg is set to upper case 'ORCA' but some tests only check for lower case matches. Here is the full set:
grep -i '"orca"' `find ./ -name '*.[fFh]90'` | grep IF ./TOP/TRP/trcdmp.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA") THEN ./TOP/PISCES/P4Z/p4zsms.F90: IF( cn_cfg == "ORCA" .OR. cn_cfg == "orca") THEN ./TOP/PISCES/trcice_pisces.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN ! Baltic Sea particular case for ORCA configurations ./TOP/PISCES/trcice_pisces.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN ./OCE/USR/usrdef_fmask.F90: IF( TRIM( cd_cfg ) == "orca" ) THEN !== ORCA Configurations ==! ./OCE/DOM/dtatsd.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN ./OCE/DOM/domain.F90: IF( cn_cfg == "ORCA" ) THEN ./OCE/DOM/domvvl.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN ./SWE/domvvl.F90: IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN ./SWE/domain.F90: IF( cn_cfg == "ORCA" ) THEN
..so just the checks in usrdef_fmask.F90 and domain.F90 which need to be extended to include the upper case test.
Recommendation
Make the minor modifications to usrdef_fmask.F90 and domain.F90 (x2).
Commit History (2)
| Changeset | Author | Time | ChangeLog |
|---|---|---|---|
| 13436 | acc | 2020-08-25T17:11:29+02:00 | r4.0-HEAD: minor modifications to usrdef_fmask.F90 and domain.F90 to consistently check for ORCA configurations. Fixed #2515 |
| 13435 | acc | 2020-08-25T16:48:42+02:00 | Trunk: minor modifications to usrdef_fmask.F90 and domain.F90 to consistently check for ORCA configurations. See #2515 |
Change History (2)
comment:1 Changed 4 years ago by acc
comment:2 Changed 4 years ago by acc
- Resolution set to fixed
- Status changed from new to closed
In 13436:
In 13435: