Changeset 3069 for trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

Timestamp:

Oct 3, 2023, 3:54:57 PM (15 months ago)

Author:

jbclement

Message:

Mars PCM:
Related to commit r3066, correction of a bug to write/read a restart/start in 1D and more adaptations of the code.
JBC

File:

• trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90 (modified) (13 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

@@ -78 +78 @@
 ! Local variables
 !=======================================================================
-integer                   :: ierr, iq, ilayer, isoil, nlevel, nsoil, flagthermo, flagh2o
+integer                   :: ierr, iq, j, ilayer, isoil, nlevel, nsoil, flagthermo, flagh2o
 integer                   :: dayn ! Final date
 real, dimension(nlayer)   :: zlay ! altitude estimee dans les couches (km)
@@ -131 +131 @@
         write(*,*) '  (which should contain some input parameters along with the following line: INCLUDEDEF=callphys.def)'
         write(*,*) ' ... might as well stop here ...'
-        stop
+        error stop
     endif
 
@@ -151 +151 @@
         write(*,*) 'Initialization is done with default values.'
     else
-        write(*,*) 'Initialization cannot be done for the 1D PEM.'
-        stop
+        error stop 'Initialization cannot be done for the 1D PEM.'
     endif
 endif
@@ -161 +160 @@
         write(*,*) 'Initialization is done with default values.'
     else
-        write(*,*) 'Initialization cannot be done for the 1D PEM.'
-        stop
+        error stop 'Initialization cannot be done for the 1D PEM.'
     endif
 endif
@@ -218 +216 @@
     write(*,*) ' If you want to run with tracers, I need it'
     write(*,*) ' ... might as well stop here ...'
-    stop
+    error stop
 else
     write(*,*) "init_testphys1d: Reading file traceur.def"
@@ -227 +225 @@
         write(*,*) "init_testphys1d: error reading number of tracers"
         write(*,*) "   (first line of traceur.def) "
-        stop
+        error stop
     endif
     if (nq < 1) then
         write(*,*) "init_testphys1d: error number of tracers"
         write(*,*) "is nq=",nq," but must be >=1!"
-        stop
+        error stop
     endif
 endif
@@ -244 +242 @@
     read(90,'(80a)',iostat = ierr) line ! store the line from traceur.def
     if (ierr /= 0) then
-        write(*,*) 'init_testphys1d: error reading tracer names...'
-        stop
+        error stop 'init_testphys1d: error reading tracer names...'
     endif
     ! if format is tnom_0, tnom_transp (isotopes)
@@ -353 +350 @@
     call getin("psurf",psurf)
 else
+    open(3,file = start1Dname,status = "old",action = "read")
     read(3,*) header, psurf
 endif
@@ -452 +450 @@
 else
     do iq = 1,nq
-        open(3,file = start1Dname,status = "old",action = "read")
-        read(3,*) header, qsurf(1,iq,1),(q(1,ilayer,iq), ilayer = 1,nlayer)
-        if (trim(tname(iq)) /= trim(header)) then
-            write(*,*) 'Tracer names not compatible for initialization with "'//trim(start1Dname)//'"!'
-            stop
-        endif
+        read(3,*) header, (qsurf(1,iq,j), j = 1,size(qsurf,3)), (q(1,ilayer,iq), ilayer = 1,nlayer)
+        if (trim(tname(iq)) /= trim(header)) error stop 'Tracer names not compatible for initialization with "'//trim(start1Dname)//'"!'
     enddo
 endif
-
-
 
 ! Initialize albedo / soil thermal inertia
@@ -562 +554 @@
     if (trim(tname(iq)) == "co2") igcm_co2 = iq
 enddo
-if (igcm_co2 == 0) then
-    write(*,*) "init_testphys1d error, missing co2 tracer!"
-    stop
-endif
+if (igcm_co2 == 0) error stop "init_testphys1d error, missing co2 tracer!"
 
 if (.not. startfiles_1D) then
@@ -615 +604 @@
     temp(:) = tmp2(1:)
 else
-    read(3,*) header, tsurf, (temp(ilayer), ilayer = 1,nlayer)
+    read(3,*) header, (tsurf(1,:), j = 1,size(tsurf,2)), (temp(ilayer), ilayer = 1,nlayer)
     close(3)
 endif
@@ -719 +708 @@
         write(*,*) 'Unless it reaches saturation (maximal value)'
     else
-        write(*,*) 'Water vapor profile value not correct!'
-        stop
+        error stop 'Water vapor profile value not correct!'
     endif
 endif
@@ -740 +728 @@
         else
             write(*,*) 'Reference atmospheric water vapor profile not known!'
-            write(*,*) 'Please, specify atm_wat_profile'
-            stop
+            error stop 'Please, specify atm_wat_profile'
         endif
     endif