Changeset 23074

Timestamp:

08/07/18 20:02:12 (7 years ago)

Author:

dmenemen

Message:

speeding up test by downloading and building MITgcm only if needed

Location:

issm/trunk-jpl/test

Files:

• MITgcm/build.sh (modified) (1 diff)
• MITgcm/code/SIZE.h (deleted)
• NightlyRun/test4001.m (modified) (1 diff)
• NightlyRun/test4002.m (modified) (2 diffs)

issm/trunk-jpl/test/MITgcm/build.sh

@@ -6 +6 @@
 modelpath="$2"
 
-if [ -e ~/.bashrc ]; then
-        source ~/.bashrc
+#if [ -e ~/.bashrc ]; then
+#    source ~/.bashrc
+#fi
+
+# Get MITgcm code, if needed
+if [ ! -d "$modelpath/../MITgcm/install" ]; then
+    cd $modelpath/../MITgcm
+    source install.sh
+    cd $modelpath
 fi
 
-# Clean up build directory
+# Create build directory, if needed
 cd $modelpath
 if [ ! -d "build" ]; then mkdir build; fi
-rm -f build/*
+cd build
 
-# Get MITgcm code, if needed
-if [ ! -d "$SLR_DIR/components/mitgcm/install" ]; then
-   cd $modelpath/../MITgcm
-   source install.sh
-   cd $modelpath
+#create MITgcm makefile for this run, if needed
+if [ ! -f Makefile ]; then
+    if [ $hostname == "pleiades" ]; then 
+        $modelpath/../MITgcm/install/tools/genmake2 -of $SLR_DIR/models/ice-ocean/configs/linux_amd64_gfortran+mpi_ice_nas -mo ../code -rd $modelpath/../MITgcm/install
+    else
+        $modelpath/../MITgcm/install/tools/genmake2 -mpi -mo $modelpath/../MITgcm/code -rd $modelpath/../MITgcm/install
+    fi
 fi
 
-#create MITgcm makefile and code links for this run
-cd build
-if [ ! -f Makefile ]; then
-
-        if [ $hostname == "pleiades" ]; then 
-                $SLR_DIR/components/mitgcm/install/tools/genmake2 -of $SLR_DIR/models/ice-ocean/configs/linux_amd64_gfortran+mpi_ice_nas -mo ../code -rd $SLR_DIR/components/mitgcm/install
-        else
-                $modelpath/../MITgcm/install/tools/genmake2 -mpi -mo $modelpath/../MITgcm/code -rd $modelpath/../MITgcm/install
-        fi
+#create MITgcm code links for this run, if needed
+if [ ! -f BUILD_INFO.h ]; then
     make depend
 fi
+
 make -j 4

issm/trunk-jpl/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
 % }}}

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

@@ -4 +4 @@
 %Script control parameters
 steps=[1 2 3 4 5 6 7 8 9 10 11 12];
+steps=[1 2 3 4 5];
 final_time=1/365;
 
@@ -136 +137 @@
 
     %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;
-        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);
+        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
-    %close  files
-    fclose(fidi);
-    fclose(fido);
-
-         system(['../MITgcm/build.sh generic ' pwd '/../MITgcm']);
+
+    system(['../MITgcm/build.sh generic ' pwd '/../MITgcm']);
 end
 % }}}