Changeset 23189 for issm/trunk/test/NightlyRun/test4001.m

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test4001.m (modified) (3 diffs)

issm/trunk/test/NightlyRun/test4001.m

@@ -136 +136 @@
 
     %specify computational grid in SIZE.h
-    fidi=fopen('../MITgcm/code/SIZE.h.bak','r');
-    fido=fopen('../MITgcm/code/SIZE.h','w');
-    tline = fgetl(fidi);
-    fprintf(fido,'%s\n',tline);
-    while 1
+    if ~exist('../MITgcm/code/SIZE.h')
+        fidi=fopen('../MITgcm/code/SIZE.h.bak','r');
+        fido=fopen('../MITgcm/code/SIZE.h','w');
         tline = fgetl(fidi);
-        if ~ischar(tline), break, end
-        %do the change here: 
-        if strcmpi(tline,'     &           sNx =  20,'),
-            fprintf(fido,'%s%i%s\n','     &           sNx =  ',round(Nx/nPx),',');
-            continue;
+        fprintf(fido,'%s\n',tline);
+        while 1
+            tline = fgetl(fidi);
+            if ~ischar(tline), break, end
+            %do the change here: 
+            if strcmpi(tline,'     &           sNx =  20,'),
+                fprintf(fido,'%s%i%s\n','     &           sNx =  ',round(Nx/nPx),',');
+                continue;
+            end
+            if strcmpi(tline,'     &           sNy =  20,'),
+                fprintf(fido,'%s%i%s\n','     &           sNy =  ',round(Ny/nPy),',');
+                continue;
+            end
+            if strcmpi(tline,'     &           nPx =   1,'),
+                fprintf(fido,'%s%i%s\n','     &           nPx = ',nPx,',');
+                continue;
+            end
+            if strcmpi(tline,'     &           nPy =   2,'),
+                fprintf(fido,'%s%i%s\n','     &           nPy = ',nPy,',');
+                continue;
+            end
+            fprintf(fido,'%s\n',tline);
         end
-        if strcmpi(tline,'     &           sNy =  20,'),
-            fprintf(fido,'%s%i%s\n','     &           sNy =  ',round(Ny/nPy),',');
-            continue;
-        end
-        if strcmpi(tline,'     &           nPx =   1,'),
-            fprintf(fido,'%s%i%s\n','     &           nPx = ',nPx,',');
-            continue;
-        end
-        if strcmpi(tline,'     &           nPy =   2,'),
-            fprintf(fido,'%s%i%s\n','     &           nPy = ',nPy,',');
-            continue;
-        end
-        fprintf(fido,'%s\n',tline);
+        %close  files
+        fclose(fidi);
+        fclose(fido);
     end
-    %close  files
-    fclose(fidi);
-    fclose(fido);
-
-         system(['../MITgcm/build.sh generic ' pwd '/../MITgcm']);
+
+    system(['../MITgcm/build.sh generic ' pwd '/../MITgcm']);
 end
 % }}}
@@ -542 +544 @@
         md.transient.isgroundingline=1;
         md.transient.isthermal=0;
-        md.groundingline.migration='SubelementMigration2';
+        md.groundingline.migration='SubelementMigration';
+        md.groundingline.melt_interpolation='SubelementMelt2';
+        md.groundingline.friction_interpolation='SubelementFriction2';
 
         md.cluster=generic('name',oshostname(),'np',2);
@@ -655 +659 @@
         md.transient.isgroundingline=1;
         md.transient.isthermal=0;
-        md.groundingline.migration='SubelementMigration2';
+        md.groundingline.migration='SubelementMigration';
+        md.groundingline.melt_interpolation='SubelementMelt2';
+        md.groundingline.friction_interpolation='SubelementFriction2';
 
         % }}}