Incomplete pre-processer conditions in def_diags.F

[fgrosse]

I think, in lines 626 and 701 of def_diags.F the pre-processor conditions should read as:

#if defined DIAGNOSTICS_BIO && defined BIO_FENNEL

Currently, they only read as:

#ifdef BIO_FENNEL

This can cause "undefined variable" errors for iDbio2 and iDbio3 during compilation when other diagnostics but not DIAGNOSTICS_BIO are enabled in combination with BIO_FENNEL.

---

Yes, thank you for bringing this problem to my attention. I cleaned the logic in def_diags.F, set_diags.F, and wrt_diags.F. I also added the 2D biological diagnotics for HYPOXIA_SRM. It was not included in the above files.

Also removed apostrophes in fennel.h documentation to suppress the warnings from ifort during compilation. I also cleaned a DIAGNOSTIC_BIO bug in hypoxia_srm.h. We don't need the 3D diagnostics arrays in this simple model.

---

Fixed OMP directives in initial.F, ad_initial.F, rp_initial.F, and tl_initial.F when the 4D-Var algorithms are activated. This bug is of no consequence since we cannot run any of the adjoint-based algorithms in shared-memory (OpenMP).