New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6260 – NEMO

Changeset 6260


Ignore:
Timestamp:
2016-01-17T18:35:45+01:00 (8 years ago)
Author:
hadcv
Message:
  • Fix an uninitialized variable
  • Remove some reference statements from field_def.xml file; these variables did not always get overwritten by their intended data.
Location:
branches/UKMO/dev_r5107_mld_zint/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5107_mld_zint/NEMOGCM/CONFIG/SHARED/field_def.xml

    r6072 r6260  
    5454         <field id="mldr10_1min"  long_name="Min of Mixed Layer Depth (dsigma = 0.01 wrt 10m)"   field_ref="mldr10_1"   operation="minimum"                                                                          /> 
    5555         <field id="mldzint_1"    long_name="Mixed Layer Depth interpolated"                     standard_name="ocean_mixed_layer_thickness"                                                       unit="m"          /> 
    56          <field id="mldzint_2"     field_ref="mldzint_1" /> 
    57          <field id="mldzint_3"     field_ref="mldzint_1" /> 
    58          <field id="mldzint_4"     field_ref="mldzint_1" /> 
    59          <field id="mldzint_5"     field_ref="mldzint_1" /> 
     56         <field id="mldzint_2"    long_name="Mixed Layer Depth interpolated"                     standard_name="ocean_mixed_layer_thickness"                                                       unit="m"          /> 
     57         <field id="mldzint_3"    long_name="Mixed Layer Depth interpolated"                     standard_name="ocean_mixed_layer_thickness"                                                       unit="m"          /> 
     58         <field id="mldzint_4"    long_name="Mixed Layer Depth interpolated"                     standard_name="ocean_mixed_layer_thickness"                                                       unit="m"          /> 
     59         <field id="mldzint_5"    long_name="Mixed Layer Depth interpolated"                     standard_name="ocean_mixed_layer_thickness"                                                       unit="m"          /> 
    6060         <field id="mldhtc_1"     long_name="Mixed Layer Depth integrated heat content"          standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
    61          <field id="mldhtc_2"      field_ref="mldhtc_1"  /> 
    62          <field id="mldhtc_3"      field_ref="mldhtc_1"  /> 
    63          <field id="mldhtc_4"      field_ref="mldhtc_1"  /> 
    64          <field id="mldhtc_5"      field_ref="mldhtc_1"  /> 
     61         <field id="mldhtc_2"     long_name="Mixed Layer Depth integrated heat content"          standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
     62         <field id="mldhtc_3"     long_name="Mixed Layer Depth integrated heat content"          standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
     63         <field id="mldhtc_4"     long_name="Mixed Layer Depth integrated heat content"          standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
     64         <field id="mldhtc_5"     long_name="Mixed Layer Depth integrated heat content"          standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
    6565         <field id="heatc"        long_name="Heat content vertically integrated"                 standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"       /> 
    6666         <field id="saltc"        long_name="Salt content vertically integrated"                                                                                                                   unit="1e-3*kg/m2" /> 

  • branches/UKMO/dev_r5107_mld_zint/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

    r6219 r6260  
    269269      ikmt(:,:) = mbathy(:,:) - 1  
    270270 
     271      ! Initialize / reset 
     272      ll_found(:,:) = .false. 
     273 
    271274      IF ( rn_iso_frac - zepsilon > 0. ) THEN 
    272275         ! Search for a uniform density/temperature region where adjacent levels           
    … …  
    275278         ! ll_found indicates whether the mixed layer depth can be found by interpolation  
    276279         ik_iso(:,:)   = ik_ref(:,:)  
    277          ll_found(:,:) = .false.  
    278280         DO jj = 1, nlcj  
    279281            DO ji = 1, nlci  
Note: See TracChangeset for help on using the changeset viewer.