Custom Query (964 matches)

river_temp and river_salt entries don't name the river and s_rho dimensions correctly.

queequeg:netcdf wilkin$ svn diff
Index: roms_metadata.m
===================================================================
--- roms_metadata.m	(revision 848)
+++ roms_metadata.m	(working copy)
@@ -2521,9 +2521,9 @@
     V.Dimensions(1).Name      = 'river';
     V.Dimensions(1).Length    = [];
     V.Dimensions(1).Unlimited = false;
-    V.Dimensions(1).Name      = 's_rho';
-    V.Dimensions(1).Length    = [];
-    V.Dimensions(1).Unlimited = false;
+    V.Dimensions(2).Name      = 's_rho';
+    V.Dimensions(2).Length    = [];
+    V.Dimensions(2).Unlimited = false;
     V.Dimensions(3).Name      = 'river_time';
     V.Dimensions(3).Length    = [];
     V.Dimensions(3).Unlimited = Unlimited;

@@ -2543,9 +2543,9 @@
     V.Dimensions(1).Name      = 'river';
     V.Dimensions(1).Length    = [];
     V.Dimensions(1).Unlimited = false;
-    V.Dimensions(1).Name      = 's_rho';
-    V.Dimensions(1).Length    = [];
-    V.Dimensions(1).Unlimited = false;
+    V.Dimensions(2).Name      = 's_rho';
+    V.Dimensions(2).Length    = [];
+    V.Dimensions(2).Unlimited = false;
     V.Dimensions(3).Name      = 'river_time';
     V.Dimensions(3).Length    = [];
     V.Dimensions(3).Unlimited = Unlimited;

In ROMS/Utility/checkdefs.F at line 1614, #elseif should be #elif:

#if defined OXYGEN && defined BIO_FENNEL
# ifdef OCMIP_OXYGEN_SC
!
      IF (Master) WRITE (stdout,20) 'OCMIP_OXYGEN_SC',                  &
     &   'Schmidt number from Keeling et al. (1998).'
      is=LEN_TRIM(Coptions)+1
      Coptions(is:is+17)=' OCMIP_OXYGEN_SC,'
# else
!
      IF (Master) WRITE (stdout,20) '!OCMIP_OXYGEN_SC',                 &
     &   'Schmidt number from Wanninkhof (1992).'
      is=LEN_TRIM(Coptions)+1
      Coptions(is:is+18)=' !OCMIP_OXYGEN_SC,'
# endif
!
      IF (Master) WRITE (stdout,20) 'OXYGEN',                           &
     &   'Add oxygen dynamics.'
      is=LEN_TRIM(Coptions)+1
      Coptions(is:is+8)=' OXYGEN,'
#elif !defined SURFACE_DO_SATURATION && defined HYPOXIA_SRM
# ifdef OCMIP_OXYGEN_SC
!
      IF (Master) WRITE (stdout,20) 'OCMIP_OXYGEN_SC',                  &
     &   'Schmidt number from Keeling et al. (1998).'
      is=LEN_TRIM(Coptions)+1
      Coptions(is:is+17)=' OCMIP_OXYGEN_SC,'
# else
!
      IF (Master) WRITE (stdout,20) '!OCMIP_OXYGEN_SC',                 &
     &   'Schmidt number from Wanninkhof (1992).'
      is=LEN_TRIM(Coptions)+1
      Coptions(is:is+18)=' !OCMIP_OXYGEN_SC,'
# endif
#endif

This file...

​https://www.myroms.org/svn/src/test/upwelling/fennel.h

...has outdated code in it. It should be brought up to date with

​https://www.myroms.org/svn/src/trunk/ROMS/Nonlinear/Biology/fennel.h