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 12010 for NEMO/branches – NEMO

Changeset 12010 for NEMO/branches


Ignore:
Timestamp:
2019-11-29T13:50:45+01:00 (4 years ago)
Author:
smueller
Message:

Enabling of the grid-type propagation from the analysed fields to the corresponding scalar-product fields in the intermediate output for multiple-linear-regression analysis (ticket #2175)

Location:
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/cfgs/SHARED/field_def_nemo-oce.xml

    r11983 r12010  
    2727 
    2828      <!-- Time --> 
    29       <field id="diamlr_time" grid_ref="diamlr_grid_2D" prec="8" /> 
     29      <field id="diamlr_time" grid_ref="diamlr_grid_T_2D" prec="8" /> 
    3030 
    3131      <!-- Regressors for tidal harmonic analysis --> 

  • NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/cfgs/SHARED/grid_def_nemo.xml

    r11942 r12010  
    6363   <scalar /> 
    6464      </grid> 
    65       <grid id="diamlr_grid_2D" > 
     65      <grid id="diamlr_grid_T_2D" > 
    6666   <domain domain_ref="grid_T" /> 
    6767   <scalar /> 
    6868      </grid> 
    69       <grid id="diamlr_grid_3D" > 
    70    <domain domain_ref="grid_T" /> 
    71    <axis axis_ref="deptht" /> 
     69      <grid id="diamlr_grid_U_2D" > 
     70   <domain domain_ref="grid_U" /> 
     71   <scalar /> 
    7272      </grid> 
    73       <grid id="diamlr_grid_2D_to_3D" > 
     73      <grid id="diamlr_grid_V_2D" > 
     74   <domain domain_ref="grid_V" /> 
     75   <scalar /> 
     76      </grid> 
     77      <grid id="diamlr_grid_W_2D" > 
     78   <domain domain_ref="grid_W" /> 
     79   <scalar /> 
     80      </grid> 
     81      <grid id="diamlr_grid_2D_to_grid_T_3D" > 
    7482   <domain domain_ref="grid_T" /> 
    7583        <axis axis_ref="deptht"> 
     84          <duplicate_scalar /> 
     85        </axis> 
     86      </grid> 
     87      <grid id="diamlr_grid_2D_to_grid_U_3D" > 
     88   <domain domain_ref="grid_U" /> 
     89        <axis axis_ref="depthu"> 
     90          <duplicate_scalar /> 
     91        </axis> 
     92      </grid> 
     93      <grid id="diamlr_grid_2D_to_grid_V_3D" > 
     94   <domain domain_ref="grid_V" /> 
     95        <axis axis_ref="depthv"> 
     96          <duplicate_scalar /> 
     97        </axis> 
     98      </grid> 
     99      <grid id="diamlr_grid_2D_to_grid_W_3D" > 
     100   <domain domain_ref="grid_W" /> 
     101        <axis axis_ref="depthw"> 
    76102          <duplicate_scalar /> 
    77103        </axis> 

  • NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/DIA/diamlr.F90

    r11972 r12010  
    7171      CHARACTER(LEN=3)                            ::   cl3i 
    7272      CHARACTER(LEN=6)                            ::   cl6a 
     73      CHARACTER(LEN=7)                            ::   cl7a 
    7374      CHARACTER(LEN=1)                            ::   clgt 
    7475      CHARACTER(LEN=2)                            ::   clgd 
    … …  
    274275            CALL xios_get_attr  ( slxhdl_regs( jm ), name=clxatt_name1, expr=clxatt_expr,              & 
    275276               &                  enabled=llxatt_enabled, comment=clxatt_comment ) 
    276             CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_2D" ) 
    277             CALL xios_set_attr  ( slxhdl_fld, expr=TRIM( clxatt_expr ), grid_ref="diamlr_grid_2D",     & 
     277            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_T_2D" ) 
     278            CALL xios_set_attr  ( slxhdl_fld, expr=TRIM( clxatt_expr ), grid_ref="diamlr_grid_T_2D",     & 
    278279               &                  field_ref="diamlr_time", enabled=llxatt_enabled ) 
    279             CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_3D") 
    280             CALL xios_set_attr  ( slxhdl_fld, expr="this", grid_ref="diamlr_grid_2D_to_3D",            & 
    281                &                  field_ref=TRIM( clxatt_name1 )//"_2D", enabled=llxatt_enabled) 
     280            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_U_2D" ) 
     281            CALL xios_set_attr  ( slxhdl_fld, expr=TRIM( clxatt_expr ), grid_ref="diamlr_grid_U_2D",     & 
     282               &                  field_ref="diamlr_time", enabled=llxatt_enabled ) 
     283            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_V_2D" ) 
     284            CALL xios_set_attr  ( slxhdl_fld, expr=TRIM( clxatt_expr ), grid_ref="diamlr_grid_V_2D",     & 
     285               &                  field_ref="diamlr_time", enabled=llxatt_enabled ) 
     286            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_W_2D" ) 
     287            CALL xios_set_attr  ( slxhdl_fld, expr=TRIM( clxatt_expr ), grid_ref="diamlr_grid_W_2D",     & 
     288               &                  field_ref="diamlr_time", enabled=llxatt_enabled ) 
     289            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_T_3D") 
     290            CALL xios_set_attr  ( slxhdl_fld, expr="this", grid_ref="diamlr_grid_2D_to_grid_T_3D",            & 
     291               &                  field_ref=TRIM( clxatt_name1 )//"_grid_T_2D", enabled=llxatt_enabled) 
     292            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_U_3D") 
     293            CALL xios_set_attr  ( slxhdl_fld, expr="this", grid_ref="diamlr_grid_2D_to_grid_U_3D",            & 
     294               &                  field_ref=TRIM( clxatt_name1 )//"_grid_U_2D", enabled=llxatt_enabled) 
     295            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_V_3D") 
     296            CALL xios_set_attr  ( slxhdl_fld, expr="this", grid_ref="diamlr_grid_2D_to_grid_V_3D",            & 
     297               &                  field_ref=TRIM( clxatt_name1 )//"_grid_V_2D", enabled=llxatt_enabled) 
     298            CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name1 )//"_grid_W_3D") 
     299            CALL xios_set_attr  ( slxhdl_fld, expr="this", grid_ref="diamlr_grid_2D_to_grid_W_3D",            & 
     300               &                  field_ref=TRIM( clxatt_name1 )//"_grid_W_2D", enabled=llxatt_enabled) 
    282301            CALL xios_set_attr  ( slxhdl_regs(jm), expr="this", grid_ref="diamlr_grid_2D_to_scalar",   & 
    283                &                  field_ref=TRIM( clxatt_name1 )//"_2D", enabled=llxatt_enabled) 
     302               &                  field_ref=TRIM( clxatt_name1 )//"_grid_T_2D", enabled=llxatt_enabled) 
    284303 
    285304            !  ii) set up output of active regressors, including metadata 
    … …  
    323342               IF ( INDEX( clxatt_gridref, "_W_" ) > 0 ) clgt="W" 
    324343               clgd="2D" 
    325                IF ( INDEX( clxatt_gridref, "_3D" ) > 0 ) clgd="3D" 
     344               cl7a="" 
     345               IF ( INDEX( clxatt_gridref, "_3D" ) > 0 ) THEN 
     346                  clgd="3D" 
     347               ELSE 
     348                  cl7a="diamlr_" 
     349               END IF 
    326350               CALL xios_add_child ( slxhdl_fldgrp, slxhdl_fld, TRIM( clxatt_name2 )//"."//TRIM( clxatt_name1 ) ) 
    327351               ! Set appropriate name attribute to avoid the possibility of 
    … …  
    332356                  &                  name=TRIM( clxatt_name2 )//"."//TRIM( clxatt_name1 ),               & 
    333357                  &                  expr="this * "//TRIM( clxatt_fieldref ),                            & 
    334                   &                  grid_ref="diamlr_grid_"//clgd,                                      & 
    335                   &                  field_ref=TRIM( clxatt_name1 )//"_"//clgd,                          & 
     358                  &                  grid_ref=cl7a//"grid_"//clgt//"_"//clgd,                                      & 
     359                  &                  field_ref=TRIM( clxatt_name1 )//"_grid_"//clgt//"_"//clgd,          & 
    336360                  &                  enabled=llxatt_enabled,                                             & 
    337361                  &                  long_name="Scalar product of "//TRIM( clxatt_fieldref )//           & 
Note: See TracChangeset for help on using the changeset viewer.