Changeset 2567 for trunk/LMDZ.MARS/util/xvik

Timestamp:

Oct 5, 2021, 8:34:09 AM (3 years ago)

Author:

emillour

Message:

Mars GCM utilities:
Minor fixes to run with picky gfortran 10.3.0 which requires one element arrays
(rather than scalars) when calling NetCDF routines, andf that stop statements
should not be followed by strings. While at it replaced tabs with spaces.
EM

File:

• trunk/LMDZ.MARS/util/xvik/fit_Iceinertia_MONSicedepth.F (modified) (14 diffs)

trunk/LMDZ.MARS/util/xvik/fit_Iceinertia_MONSicedepth.F

@@ -132 +132 @@
     
        maxiceidiff = 3000  ! maximum allowed difference between N and S best fit ice thermal inertia
-       deltaicei= 20     ! step in ice thermal inertia
+       deltaicei= 20         ! step in ice thermal inertia
        maxiceddiff = 30.e-4  ! maximum allowed difference between N and S best fit ice depth
        deltaiced= 0.5e-4 ! step in ice depth coefficient
@@ -332 +332 @@
         read(13,*) solgcm(n), patm(n,3), pcapn(n,3),pcaps(n,3)
         read(14,*) solgcm(n), patm(n,4), pcapn(n,4),pcaps(n,4)
-        
+        
         elseif (time_unit == 2) then
         read(21,*) lsgcm(n),  pvl_gcm(n,1)
@@ -358 +358 @@
         read(13,*) solgcm(n), lsgcm(n), patm(n,3), pcapn(n,3),pcaps(n,3)
         read(14,*) solgcm(n), lsgcm(n), patm(n,4), pcapn(n,4),pcaps(n,4)
-        
-        else 
-        write(*,*) 'Wrong integer for xvik files format :',
+        
+        else 
+        write(*,*) 'Wrong integer for xvik files format :',
      &' must be 1, 2 or 3'
         stop
 
         endif
-        
+        
 c       Checking total CO2 inventory for all runs :
         do i=1,4
@@ -381 +381 @@
       end do
 
-        close(11)
-        close(12)
-        close(13)
-        close(14)
-        close(21)
-        close(22)
-        close(23)
-        close(24)
-        
-        
+        close(11)
+        close(12)
+        close(13)
+        close(14)
+        close(21)
+        close(22)
+        close(23)
+        close(24)
+        
+        
 c      Smoothing simulated GCM Viking 1 pressure curves
 c      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -493 +493 @@
 c     to plot COST(DN,DS) (plot_test=1), loops must be in this order : DN->DS->IN->IS            
         write(*,*)'   DN        DS      cost       IN       IS       Ps'
-        icedn=icedmin ! initialization          
+        icedn=icedmin ! initialization                
         do while (icedn.le.icedmax) ! loop on northern ice depth coefficient
 !         albn=albmin ! initialization
@@ -510 +510 @@
               cost =0. !initialization
               do n=1,nsol  
-                !write(*,*) n
+                !write(*,*) n
                ! Pressure corresponding to Northern cap
                pcapn_new=pcapn_sm(n,refrun)+
@@ -527 +527 @@
                ! and observed pressures at VL1 site
                cost= cost+ ( pvl_obs(n) - pvl1)**2 
-                
+                
               end do ! of do n=1,nsol
               ! store parameters which lead to minimum cost
@@ -539 +539 @@
                  icedsfit=iceds
               end if
-           
+           
               if(cost.lt.cost4plot) then
 c                RMS, best pressure and best albedos for these icedsivities value 
@@ -575 +575 @@
 c     to plot COST(IN,IS) (plot_test=2), loops must be in this order : IN->IS->DN->DS            
         write(*,*)'   DN        DS      cost       IN       IS       Ps'
-        write(33,*)'   DN        DS      cost       IN       IS     
-     &Ps'       
-        icein=iceimin ! initialization          
+        write(33,*)'   DN        DS      cost       IN       IS     Ps'
+        icein=iceimin ! initialization                
         do while (icein.le.iceimax) ! loop on northern ice depth coefficient
 !         albn=albmin ! initialization
@@ -594 +593 @@
               cost =0. !initialization
               do n=1,nsol  
-                !write(*,*) n
+                !write(*,*) n
                ! Pressure corresponding to Northern cap
                pcapn_new=pcapn_sm(n,refrun)+
@@ -611 +610 @@
                ! and observed pressures at VL1 site
                cost= cost+ ( pvl_obs(n) - pvl1)**2 
-                
+                
               end do ! of do n=1,nsol
               ! store parameters which lead to minimum cost
@@ -623 +622 @@
                  icedsfit=iceds
               end if
-           
+           
               if(cost.lt.cost4plot) then
 c                RMS, best pressure and best albedos for these icedsivities value 
@@ -683 +682 @@
      &      + (fonc2s(icedsfit) -fonc2s(icedgcm_ref)) * dpdes(n)
            pcaps_new= max(pcaps_new,0.)
-        
+        
       call sol2ls(sol(n),solconv)   
       
@@ -722 +721 @@
 
 
-      if (nbig.lt.3*nmax) stop 'Must increase nbig in runave'
+      if (nbig.lt.3*nmax) then
+        write(*,*) 'Must increase nbig in runave'
+        stop
+      endif
 
 c     Reindexation des donnees