Changeset 27591

Timestamp:

02/17/23 14:02:58 (2 years ago)

Author:

seroussi

Message:

CHG: use size in code_remesh directly

File:

• issm/trunk-jpl/test/NightlyRun/test4005.m (modified) (8 diffs)

issm/trunk-jpl/test/NightlyRun/test4005.m

@@ -8 +8 @@
 !rm -rf ${ISSM_DIR}/test/MITgcm/install
 !rm -rf ${ISSM_DIR}/test/MITgcm/build/*
-!rm -f ${ISSM_DIR}/test/MITgcm/code/SIZE.h
 !rm -rf Models
 
@@ -22 +21 @@
     Ny=40; %number of latitude cells
     Nz=30; %number of MITgcm vertical cells
-    nPx=2; %number of MITgcm processes to use in x direction
-    nPy=4; %number of MITgcm processes to use in y direction
+    nPx=1; %number of MITgcm processes to use in x direction
+    nPy=2; %number of MITgcm processes to use in y direction
     xgOrigin=0; %origin of longitude
     ygOrigin=-80; %origin of latitude
@@ -140 +139 @@
     loaddata(org,'Parameters');
 
-    %specify computational grid in SIZE.h
-    if ~exist('../MITgcm/code/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
-            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
-        %close  files
-        fclose(fidi);
-        fclose(fido);
-    end
-
-    system(['../MITgcm/build.sh amundsen ' pwd '/../MITgcm']);
+    system(['../MITgcm/build_remesh.sh amundsen ' pwd '/../MITgcm']);
 end
 % }}}
@@ -197 +163 @@
     !\mkdir run
     !\cp ../MITgcm/build/mitgcmuv run
-    !\cp ../MITgcm/input/* run
-    !\cp ../MITgcm/input/eedata_uncoupled run/eedata
+    !\cp ../MITgcm/input_remesh/* run
+    !\cp ../MITgcm/input_remesh/eedata_uncoupled run/eedata
 
     %load data:
@@ -242 +208 @@
 
     % build parameter file data.obcs
-    fidi=fopen('../MITgcm/input/data.obcs','r');
+    fidi=fopen('../MITgcm/input_remesh/data.obcs','r');
     fido=fopen('run/data.obcs','w');
     tline = fgetl(fidi);
@@ -277 +243 @@
         disp(['Year: ' num2str(t)])
         % {{{ generate MITgcm parameter file data
-        fidi=fopen('../MITgcm/input/data','r');
+        fidi=fopen('../MITgcm/input_remesh/data','r');
         fido=fopen('run/data','w');
         tline = fgetl(fidi);
@@ -588 +554 @@
         !\mkdir run
         !\cp ../MITgcm/build/mitgcmuv run
-        !\cp ../MITgcm/input/* run
-        !\cp ../MITgcm/input/eedata_uncoupled run/eedata
+        !\cp ../MITgcm/input_remesh/* run
+        !\cp ../MITgcm/input_remesh/eedata_uncoupled run/eedata
 
         %load data:
@@ -633 +599 @@
 
         % build parameter file data.obcs
-        fidi=fopen('../MITgcm/input/data.obcs','r');
+        fidi=fopen('../MITgcm/input_remesh/data.obcs','r');
         fido=fopen('run/data.obcs','w');
         tline = fgetl(fidi);