Changeset 11777 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/grid_def_nemo.xml

Timestamp:

2019-10-23T17:49:24+02:00 (5 years ago)

Author:

acc

Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Begin merge prepartions by merging changes on the trunk since this branch creation. Do this in staged commits in case of issues. First stage is to merge and commit changes to cfgs directory (cd cfgs; svn merge -r 10721:11740 ​svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk/cfgs ./)

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/grid_def_nemo.xml (modified) (2 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/grid_def_nemo.xml

@@ -7 +7 @@
        </grid>
         <!--  -->
-       <grid id="grid_T_3D_ncatice" >
+       <grid id="grid_T_ncatice" >
          <domain id="grid_T" />
          <axis id="ncatice" />
@@ -49 +49 @@
        </grid>
         <!--  -->
-       <grid id="grid_1point" >
-         <domain domain_ref="1point"/>
-       </grid>
-        <!--  -->
        <grid id="grid_T_nfloat" >
          <domain id="grid_T" />
          <axis id="nfloat" />
        </grid>
+      <!-- scalars -->
+      <grid id="grid_scalar" >
+        <scalar/>
+      </grid>
 
     </grid_definition>