Changeset 9798

Timestamp:

2018-06-14T10:58:37+02:00 (6 years ago)

Author:

malcolmroberts

Message:

Changed iom and field_def to enable scalar output to work

Location:

branches/UKMO/dev_r5518_GO6_package_7771_fix_scalar/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (3 diffs)
• NEMO/OPA_SRC/IOM/iom.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_7771_fix_scalar/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -565 +565 @@
       <!-- scalar variables available with key_diaar5 -->
 
-      <field_group id="scalar"  domain_ref="1point" >
+      <field_group id="scalar"  grid_ref="scalar" >
          <field id="voltot"     long_name="Sea Water Volume"                             standard_name="sea_water_volume"                               unit="m3"   />
          <field id="sshtot"     long_name="global mean ssh"                              standard_name="global_average_sea_level_change"                unit="m"    />
@@ -594 +594 @@
       <!-- LIM3 scalar variables -->
 
-      <field_group id="SBC_scalar"  domain_ref="1point" >
+      <field_group id="SBC_scalar"  grid_ref="scalar" >
          <!-- available with ln_limdiaout -->
          <field id="ibgvoltot"    long_name="global mean ice volume"                                 unit="km3"        />
@@ -651 +651 @@
       <!-- variables available with key_float -->
 
-      <field_group id="floatvar" domain_ref="1point" axis_ref="nfloat" operation="instant" >
+      <field_group id="floatvar" grid_ref="scalar" axis_ref="nfloat" operation="instant" >
         <field id="traj_lon"      long_name="floats longitude"                                                           unit="degrees_east"  />
         <field id="traj_lat"      long_name="floats latitude"                                                            unit="degrees_north" />

branches/UKMO/dev_r5518_GO6_package_7771_fix_scalar/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -1150 +1150 @@
       CHARACTER(LEN=*), INTENT(in) ::   cdname
       REAL(wp)        , INTENT(in) ::   pfield0d
+#if ! defined key_xios2
       REAL(wp)        , DIMENSION(jpi,jpj) ::   zz     ! masson
+#endif
 #if defined key_iomput
+#if ! defined key_xios2
       zz(:,:)=pfield0d
       CALL xios_send_field(cdname, zz)
       !CALL xios_send_field(cdname, (/pfield0d/)) 
+#else
+      CALL xios_send_field(cdname, (/pfield0d/)) 
+#endif
 #else
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield0d   ! useless test to avoid compilation warnings