Changeset 8298
- Timestamp:
- 2017-07-07T14:25:06+02:00 (7 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM/CONFIG/SHARED/field_def.xml
r8104 r8298 570 570 <!-- scalar variables available with key_diaar5 --> 571 571 572 <field_group id="scalar" domain_ref="1point" >572 <field_group id="scalar" grid_ref="scalar" > 573 573 <field id="voltot" long_name="Sea Water Volume" standard_name="sea_water_volume" unit="m3" /> 574 574 <field id="sshtot" long_name="global mean ssh" standard_name="global_average_sea_level_change" unit="m" /> … … 599 599 <!-- LIM3 scalar variables --> 600 600 601 <field_group id="SBC_scalar" domain_ref="1point" >601 <field_group id="SBC_scalar" grid_ref="scalar" > 602 602 <!-- available with ln_limdiaout --> 603 603 <field id="ibgvoltot" long_name="global mean ice volume" unit="km3" /> … … 656 656 <!-- variables available with key_float --> 657 657 658 <field_group id="floatvar" domain_ref="1point" axis_ref="nfloat" operation="instant" >658 <field_group id="floatvar" grid_ref="scalar" axis_ref="nfloat" operation="instant" > 659 659 <field id="traj_lon" long_name="floats longitude" unit="degrees_east" /> 660 660 <field id="traj_lat" long_name="floats latitude" unit="degrees_north" /> … … 1103 1103 1104 1104 </field_definition> 1105 1106 -
branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
r8280 r8298 522 522 </field_group> 523 523 524 <field_group id="PISCES_scalar" domain_ref="1point" >524 <field_group id="PISCES_scalar" grid_ref="scalar" > 525 525 <field id="pno3tot" long_name="global mean nitrate concentration" unit="mol/m3" /> 526 526 <field id="ppo4tot" long_name="global mean phosphorus concentration" unit="mol/m3" /> -
branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM/CONFIG/SHARED/field_def_dyn.xml
r8280 r8298 561 561 <!-- scalar variables available with key_diaar5 --> 562 562 563 <field_group id="scalar" domain_ref="1point" >563 <field_group id="scalar" grid_ref="scalar" > 564 564 <field id="voltot" long_name="Sea Water Volume" standard_name="sea_water_volume" unit="m3" /> 565 565 <field id="sshtot" long_name="global mean ssh" standard_name="global_average_sea_level_change" unit="m" /> … … 590 590 <!-- LIM3 scalar variables --> 591 591 592 <field_group id="SBC_scalar" domain_ref="1point" >592 <field_group id="SBC_scalar" grid_ref="scalar" > 593 593 <!-- available with ln_limdiaout --> 594 594 <field id="ibgvoltot" long_name="global mean ice volume" unit="km3" /> … … 647 647 <!-- variables available with key_float --> 648 648 649 <field_group id="floatvar" domain_ref="1point" axis_ref="nfloat" operation="instant" >649 <field_group id="floatvar" grid_ref="scalar" axis_ref="nfloat" operation="instant" > 650 650 <field id="traj_lon" long_name="floats longitude" unit="degrees_east" /> 651 651 <field id="traj_lat" long_name="floats latitude" unit="degrees_north" /> -
branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM/CONFIG/SHARED/iodef_medusa_et_al.xml
r8280 r8298 397 397 </grid> 398 398 <!-- --> 399 <grid id="scalar" > 400 <!--A blank grid to represent a 0D scalar variable --> 401 </grid> 402 <!-- --> 399 403 <grid id="grid_T_nfloat" > 400 404 <domain id="grid_T" /> -
branches/UKMO/dev_r5518_GO6_package_fix_scalar/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r8104 r8298 1034 1034 !!---------------------------------------------------------------------- 1035 1035 SUBROUTINE iom_g0d_intatt( kiomid, cdatt, pvar ) 1036 INTEGER , INTENT(in ) :: kiomid ! 1036 INTEGER , INTENT(in ) :: kiomid !Identifier of the file 1037 1037 CHARACTER(len=*), INTENT(in ) :: cdatt ! Name of the attribute 1038 1038 INTEGER , INTENT( out) :: pvar ! read field … … 1150 1150 CHARACTER(LEN=*), INTENT(in) :: cdname 1151 1151 REAL(wp) , INTENT(in) :: pfield0d 1152 #if ! defined key_xios2 1152 1153 REAL(wp) , DIMENSION(jpi,jpj) :: zz ! masson 1154 #endif 1153 1155 #if defined key_iomput 1156 #if ! defined key_xios2 1154 1157 zz(:,:)=pfield0d 1155 1158 CALL xios_send_field(cdname, zz) 1156 !CALL xios_send_field(cdname, (/pfield0d/)) 1159 #else 1160 CALL xios_send_field(cdname, (/pfield0d/)) 1161 #endif 1157 1162 #else 1158 1163 IF( .FALSE. ) WRITE(numout,*) cdname, pfield0d ! useless test to avoid compilation warnings
Note: See TracChangeset
for help on using the changeset viewer.